diff --git a/composer.json b/composer.json
index 792c5f0dce8f8636b76826cfaabb0856fb175b6c..9bc716f7a5d2cf3a197872de840853a4fbcfd4c4 100644
--- a/composer.json
+++ b/composer.json
@@ -66,7 +66,6 @@
 		"typo3/cms-backend": "self.version",
 		"typo3/cms-belog": "self.version",
 		"typo3/cms-beuser": "self.version",
-		"typo3/cms-cms": "self.version",
 		"typo3/cms-context-help": "self.version",
 		"typo3/cms-core": "self.version",
 		"typo3/cms-cshmanual": "self.version",
diff --git a/typo3/sysext/core/Classes/Utility/GeneralUtility.php b/typo3/sysext/core/Classes/Utility/GeneralUtility.php
index 8eaa2c03eb6647f93d29c5ed85c20761a8fe902b..42a2f56856c46505354c6db06da392ee41c9d91b 100755
--- a/typo3/sysext/core/Classes/Utility/GeneralUtility.php
+++ b/typo3/sysext/core/Classes/Utility/GeneralUtility.php
@@ -3977,6 +3977,24 @@ Connection: close
 	 * @return array Value of $LOCAL_LANG found in the included file. If that array is found it will returned.
 	 */
 	static public function readLLfile($fileRef, $langKey, $charset = '', $errorMode = 0) {
+		// @deprecated since CMS 7, will be removed with CMS 8
+		// this is a fallback to convert references to old 'cms' locallang files to the new location
+		if (strpos($fileRef, 'EXT:cms') === 0) {
+			$mapping = [
+				'cms/web_info/loallang.xlf' => 'frontend/Resources/Private/Language/locallang_webinfo.xlf',
+				'cms/locallang_ttc.xlf' => 'frontend/Resources/Private/Language/locallang_ttc.xlf',
+				'cms/locallang_tca.xlf' => 'frontend/Resources/Private/Language/locallang_tca.xlf',
+				'cms/layout/locallang_db_new_content_el.xlf' => 'backend/Resources/Private/Language/locallang_db_new_content_el.xlf',
+				'cms/layout/locallang.xlf' => 'backend/Resources/Private/Language/locallang_layout.xlf',
+				'cms/layout/locallang_mod.xlf' => 'backend/Resources/Private/Language/locallang_mod.xlf',
+				'cms/locallang_csh_webinfo.xlf' => 'frontend/Resources/Private/Language/locallang_csh_webinfo.xlf',
+				'cms/locallang_csh_weblayout.xlf' => 'frontend/Resources/Private/Language/locallang_csh_weblayout.xlf',
+			];
+			$filePath = substr($fileRef, 4);
+			self::deprecationLog('There is a reference to "' . $fileRef . '", which has been moved to "EXT:' . $mapping[$filePath] . '". This fallback will be removed with CMS 8.');
+			$fileRef = 'EXT:' . $mapping[$filePath];
+		}
+
 		/** @var $languageFactory \TYPO3\CMS\Core\Localization\LocalizationFactory */
 		$languageFactory = self::makeInstance(\TYPO3\CMS\Core\Localization\LocalizationFactory::class);
 		return $languageFactory->getParsedData($fileRef, $langKey, $charset, $errorMode);
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-67991-RemoveExtCms.rst b/typo3/sysext/core/Documentation/Changelog/master/Deprecation-67991-RemovedExtCms.rst
similarity index 76%
rename from typo3/sysext/core/Documentation/Changelog/master/Breaking-67991-RemoveExtCms.rst
rename to typo3/sysext/core/Documentation/Changelog/master/Deprecation-67991-RemovedExtCms.rst
index 7e017097e1a0441b36f19bf15ed8937a6e5e4a7a..d3265583c72165ca968058efb7d8f816d7f3605a 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Breaking-67991-RemoveExtCms.rst
+++ b/typo3/sysext/core/Documentation/Changelog/master/Deprecation-67991-RemovedExtCms.rst
@@ -1,19 +1,19 @@
-=================================
-Breaking: #67991 - Remove ext:cms
-=================================
+=====================================
+Deprecation: #67991 - Removed ext:cms
+=====================================
 
 Description
 ===========
 
-Extension ``cms`` was removed. Most functionality have been moved to extension ``frontend`` with version 6.0 already.
+Extension ``cms`` was removed. Most functionality has been moved to extension ``frontend`` with version 6.0 already.
 The rest of the files have now been moved to other extensions, extension ``cms`` does not exist anymore.
 
 
 Impact
 ======
 
-Language files from EXT:cms are moved to different places into the core. 3rd party extensions using one of the moved
-files doesn't show any translation anymore.
+Language files from EXT:cms are moved to different places into the core. ``LLL:EXT:cms/...`` references are
+rewritten dynamically to the new file locations, but this fallback layer is subject to be removed with CMS 8.
 
 Third party extensions that define a dependency to extension ``cms`` will get their dependency rewritten to ``core``
 on the fly during extension installation as a compatibility layer.
@@ -22,7 +22,7 @@ on the fly during extension installation as a compatibility layer.
 Affected Installations
 ======================
 
-All 3rd party extensions that uses language labels from extension ``cms`` or define a dependenty to extension ``cms``
+All 3rd party extensions using language labels from extension ``cms`` or defining a dependency to extension ``cms``
 in ``ext_emconf.php``.
 
 
diff --git a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
index 0e50347cba825c79fdb08c5f71d3bc0270538e40..61140cc62ee6c10831252d218fb2819bc8e42eb5 100644
--- a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
+++ b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
@@ -3310,7 +3310,7 @@ class TypoScriptFrontendController {
 
 	/**
 	 * Determines to include custom or pagegen.php script
-	 * returns script-filename if a TypoScript (config) script is defined and should be include instead of pagegen.php
+	 * returns script-filename if a TypoScript (config) script is defined and should be included instead of pagegen.php
 	 *
 	 * @return string The relative filepath of "config.pageGenScript" if found and allowed
 	 */
diff --git a/typo3/sysext/t3editor/res/tsref/tsref.xml b/typo3/sysext/t3editor/res/tsref/tsref.xml
index fa34eea6d774c390c026f37f631a281853ecdecb..92b7c49da9da9ef41533f5abd4718a181bed1bc6 100644
--- a/typo3/sysext/t3editor/res/tsref/tsref.xml
+++ b/typo3/sysext/t3editor/res/tsref/tsref.xml
@@ -656,14 +656,14 @@ If this property is set, images are not allowed to be scaled up in size. This pa
 		</property>
 		<property name="pageGenScript" type="string">
 			<description><![CDATA[Alternative page generation script for applications using index_ts.php for initialization, caching, stating and so on. This script is included in the global scope of index_ts.php-script and thus you may include libraries here. Always use include_once for libraries.
-Remember not to output anything from such an included script. All content must be set into $TSFE->content. Take a look at typo3/sysext/cms/tslib/pagegen.php
+Remember not to output anything from such an included script. All content must be set into $TSFE->content. Take a look at \TYPO3\CMS\Frontend\Page\PageGenerator
 
 NOTE: This option is ignored if
 
 $TYPO3_CONF_VARS["FE"]["noPHPscriptInclude"]=1;
 
 is set in localconf.php.]]></description>
-			<default><![CDATA[typo3/sysext/cms/tslib/pagegen.php]]></default>
+			<default><![CDATA[typo3/sysext/frontend/Classes/Page/PageGenerator.php]]></default>
 		</property>
 		<property name="pageRendererTemplateFile" type="string">
 			<description><![CDATA[