diff --git a/composer.json b/composer.json
index e19f90efa95faa780343aa7df2537edf216d39ca..be172b0f9e5658eff37ab237db792457bcb5d259 100644
--- a/composer.json
+++ b/composer.json
@@ -143,7 +143,6 @@
 			"TYPO3\\CMS\\Beuser\\": "typo3/sysext/beuser/Classes/",
 			"TYPO3\\CMS\\ContextHelp\\": "typo3/sysext/context_help/Classes/",
 			"TYPO3\\CMS\\Core\\": "typo3/sysext/core/Classes/",
-			"TYPO3\\CMS\\Compatibility7\\": "typo3/sysext/compatibility7/Classes/",
 			"TYPO3\\CMS\\Cshmanual\\": "typo3/sysext/cshmanual/Classes/",
 			"TYPO3\\CMS\\CssStyledContent\\": "typo3/sysext/css_styled_content/Classes/",
 			"TYPO3\\CMS\\Dbal\\": "typo3/sysext/dbal/Classes/",
diff --git a/composer.lock b/composer.lock
index 30dc1f61af09ee4cb809812051fee48c6dbf3a6e..9222bc268a80d1b1a18786017796af6e9c3aee3c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "f5f44db11e9fb355e29c7b8417843334",
+    "hash": "ae5f998adfea86ace4c8eef8bbc9519c",
     "content-hash": "9f73bd96ca33d16df039a1031db620e7",
     "packages": [
         {
diff --git a/typo3/sysext/compatibility7/composer.json b/typo3/sysext/compatibility7/composer.json
index 2e017d567d085b048c7a179e65a7ae67fdf4370c..596d388fd7416d760c7da627a5a7fd1d04cefe5f 100644
--- a/typo3/sysext/compatibility7/composer.json
+++ b/typo3/sysext/compatibility7/composer.json
@@ -1,6 +1,6 @@
 {
 	"name": "typo3/cms-compatibility7",
-	"type": "typo3-cms-framework",
+	"type": "typo3-cms-extension",
 	"description": "TYPO3 Core",
 	"homepage": "https://typo3.org",
 	"license": ["GPL-2.0+"],
@@ -11,6 +11,9 @@
 	"replace": {
 		"compatibility7": "*"
 	},
+	"conflict": {
+		"typo3/cms-compatibility6": "*"
+	},
 	"extra": {
 		"typo3/class-alias-loader": {
 			"class-alias-maps": [
diff --git a/typo3/sysext/compatibility7/ext_emconf.php b/typo3/sysext/compatibility7/ext_emconf.php
index d6fa3c8130078059b4d2dac6bff680a049d97a08..25ece3a3b4de6ef4c3e06d16619bd3bfed6faefe 100644
--- a/typo3/sysext/compatibility7/ext_emconf.php
+++ b/typo3/sysext/compatibility7/ext_emconf.php
@@ -15,7 +15,9 @@ $EM_CONF[$_EXTKEY] = array(
         'depends' => array(
             'typo3' => '8.2.0-8.2.99',
         ),
-        'conflicts' => array(),
+        'conflicts' => array(
+            'compatibility6' => '0.0.0',
+        ),
         'suggests' => array(
             'indexed_search'
         ),