diff --git a/config/v9/typo3-94.php b/config/v9/typo3-94.php
index 0728ee69a..1f56fd59e 100644
--- a/config/v9/typo3-94.php
+++ b/config/v9/typo3-94.php
@@ -52,4 +52,5 @@
     $services->set(UseClassSchemaInsteadReflectionServiceMethodsRector::class);
     $services->set(RemoveMethodsFromEidUtilityAndTsfeRector::class);
     $services->set(AdditionalFieldProviderRector::class);
+    $services->set(\Ssch\TYPO3Rector\Rector\v9\v4\GeneralUtilityGetHostNameToGetIndpEnvRector::class);
 };
diff --git a/src/Rector/v9/v4/GeneralUtilityGetHostNameToGetIndpEnvRector.php b/src/Rector/v9/v4/GeneralUtilityGetHostNameToGetIndpEnvRector.php
new file mode 100644
index 000000000..79c930f25
--- /dev/null
+++ b/src/Rector/v9/v4/GeneralUtilityGetHostNameToGetIndpEnvRector.php
@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ssch\TYPO3Rector\Rector\v9\v4;
+
+use PhpParser\Node;
+use PhpParser\Node\Expr\StaticCall;
+use PHPStan\Type\ObjectType;
+use Rector\Core\Rector\AbstractRector;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
+use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+
+/**
+ * @changelog https://docs.typo3.org/c/typo3/cms-core/master/en-us/Changelog/9.4/Deprecation-85759-GeneralUtilitygetHostName.html
+ * @see \Ssch\TYPO3Rector\Tests\Rector\v9\v4\GeneralUtilityGetHostNameToGetIndpEnvRector\GeneralUtilityGetHostNameToGetIndpEnvRectorTest
+ */
+final class GeneralUtilityGetHostNameToGetIndpEnvRector extends AbstractRector
+{
+    /**
+     * @return array<class-string<Node>>
+     */
+    public function getNodeTypes(): array
+    {
+        return [StaticCall::class];
+    }
+
+    /**
+     * @param StaticCall $node
+     */
+    public function refactor(Node $node): ?Node
+    {
+        if (! $this->nodeTypeResolver->isMethodStaticCallOrClassMethodObjectType(
+            $node,
+            new ObjectType('TYPO3\CMS\Core\Utility\GeneralUtility')
+        )) {
+            return null;
+        }
+
+        if (! $this->isName($node->name, 'getHostname')) {
+            return null;
+        }
+
+        $node->name = new Node\Identifier('getIndpEnv');
+        $node->args = $this->nodeFactory->createArgs(['HTTP_HOST']);
+
+        return $node;
+    }
+
+    /**
+     * @codeCoverageIgnore
+     */
+    public function getRuleDefinition(): RuleDefinition
+    {
+        return new RuleDefinition(
+            'Migrating method call GeneralUtility::getHostname() to GeneralUtility::getIndpEnv(\'HTTP_HOST\')',
+            [
+                new CodeSample(
+                    <<<'CODE_SAMPLE'
+\TYPO3\CMS\Core\Utility\GeneralUtility::getHostname();
+CODE_SAMPLE
+                ,
+                    <<<'CODE_SAMPLE'
+\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('HTTP_HOST')
+CODE_SAMPLE
+                ),
+
+            ]
+        );
+    }
+}
diff --git a/tests/Rector/v9/v4/GeneralUtilityGetHostNameToGetIndpEnvRector/Fixture/get_host_name_to_get_indp_env.php.inc b/tests/Rector/v9/v4/GeneralUtilityGetHostNameToGetIndpEnvRector/Fixture/get_host_name_to_get_indp_env.php.inc
new file mode 100644
index 000000000..f95fff040
--- /dev/null
+++ b/tests/Rector/v9/v4/GeneralUtilityGetHostNameToGetIndpEnvRector/Fixture/get_host_name_to_get_indp_env.php.inc
@@ -0,0 +1,19 @@
+<?php
+
+namespace Ssch\TYPO3Rector\Tests\Rector\v9\v4\GeneralUtilityGetHostNameToGetIndpEnvRector\Fixture;
+
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
+GeneralUtility::getHostName();
+
+?>
+-----
+<?php
+
+namespace Ssch\TYPO3Rector\Tests\Rector\v9\v4\GeneralUtilityGetHostNameToGetIndpEnvRector\Fixture;
+
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
+GeneralUtility::getIndpEnv('HTTP_HOST');
+
+?>
diff --git a/tests/Rector/v9/v4/GeneralUtilityGetHostNameToGetIndpEnvRector/GeneralUtilityGetHostNameToGetIndpEnvRectorTest.php b/tests/Rector/v9/v4/GeneralUtilityGetHostNameToGetIndpEnvRector/GeneralUtilityGetHostNameToGetIndpEnvRectorTest.php
new file mode 100644
index 000000000..347f7e397
--- /dev/null
+++ b/tests/Rector/v9/v4/GeneralUtilityGetHostNameToGetIndpEnvRector/GeneralUtilityGetHostNameToGetIndpEnvRectorTest.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ssch\TYPO3Rector\Tests\Rector\v9\v4\GeneralUtilityGetHostNameToGetIndpEnvRector;
+
+use Iterator;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+use Symplify\SmartFileSystem\SmartFileInfo;
+
+final class GeneralUtilityGetHostNameToGetIndpEnvRectorTest extends AbstractRectorTestCase
+{
+    /**
+     * @dataProvider provideData()
+     */
+    public function test(SmartFileInfo $fileInfo): void
+    {
+        $this->doTestFileInfo($fileInfo);
+    }
+
+    /**
+     * @return Iterator<SmartFileInfo>
+     */
+    public function provideData(): Iterator
+    {
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
+    }
+
+    public function provideConfigFilePath(): string
+    {
+        return __DIR__ . '/config/configured_rule.php';
+    }
+}
diff --git a/tests/Rector/v9/v4/GeneralUtilityGetHostNameToGetIndpEnvRector/config/configured_rule.php b/tests/Rector/v9/v4/GeneralUtilityGetHostNameToGetIndpEnvRector/config/configured_rule.php
new file mode 100644
index 000000000..e307fecb0
--- /dev/null
+++ b/tests/Rector/v9/v4/GeneralUtilityGetHostNameToGetIndpEnvRector/config/configured_rule.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $containerConfigurator->import(__DIR__ . '/../../../../../../config/config_test.php');
+
+    $services = $containerConfigurator->services();
+    $services->set(\Ssch\TYPO3Rector\Rector\v9\v4\GeneralUtilityGetHostNameToGetIndpEnvRector::class);
+};