diff --git a/typo3/sysext/core/Classes/Page/PageRenderer.php b/typo3/sysext/core/Classes/Page/PageRenderer.php
index aa942f27164d8d882676dc073eedf091b160b92c..82763c6c1dbee63532de5be4cfdf23efce5a838c 100644
--- a/typo3/sysext/core/Classes/Page/PageRenderer.php
+++ b/typo3/sysext/core/Classes/Page/PageRenderer.php
@@ -431,6 +431,8 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
             '<style type="text/css">' . LF . '/*<![CDATA[*/' . LF . '<!-- ' . LF,
             '-->' . LF . '/*]]>*/' . LF . '</style>' . LF
         ];
+
+        $this->setMetaTag('name', 'generator', 'TYPO3 CMS');
     }
 
     /**
diff --git a/typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php b/typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php
index 482724af61e94326e5f6da6d75fc5a1efd1a5270..d1760714fbae721d42132fe726ef014b82d62056 100644
--- a/typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php
+++ b/typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php
@@ -118,6 +118,7 @@ class PageRendererTest extends \TYPO3\TestingFramework\Core\Functional\Functiona
         $this->assertContains('<meta name="dc.author" content="&lt;evil tag&gt;" />', $renderedString);
         $this->assertNotContains('<meta name="randomtag" content="foobar">', $renderedString);
         $this->assertNotContains('<meta name="randomtag" content="foobar" />', $renderedString);
+        $this->assertContains('<meta name="generator" content="TYPO3 CMS" />', $renderedString);
     }
 
     /**