diff --git a/typo3/sysext/core/Documentation/Changelog-8.rst b/typo3/sysext/core/Documentation/Changelog-8.rst
new file mode 100644
index 0000000000000000000000000000000000000000..1c684bef6ce262ad284f897dc82c1dfb82146061
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog-8.rst
@@ -0,0 +1,21 @@
+:orphan:
+
+.. include:: Includes.txt
+
+============
+ChangeLog v8
+============
+
+Every change to the TYPO3 Core which might affect your site is documented here.
+
+.. toctree::
+   :titlesonly:
+
+   Changelog/8.7/Index
+   Changelog/8.6/Index
+   Changelog/8.5/Index
+   Changelog/8.4/Index
+   Changelog/8.3/Index
+   Changelog/8.2/Index
+   Changelog/8.1/Index
+   Changelog/8.0/Index
diff --git a/typo3/sysext/core/Documentation/Changelog-9.rst b/typo3/sysext/core/Documentation/Changelog-9.rst
new file mode 100644
index 0000000000000000000000000000000000000000..485a31ca5ea378a078b7d8fbff09753a36de0cb2
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog-9.rst
@@ -0,0 +1,14 @@
+:orphan:
+
+.. include:: Includes.txt
+
+============
+ChangeLog v9
+============
+
+Every change to the TYPO3 Core which might affect your site is documented here.
+
+.. toctree::
+   :titlesonly:
+
+   Changelog/9.0/Index
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Index.rst b/typo3/sysext/core/Documentation/Changelog/master/Index.rst
index 40688c191d8aa70b2519d7c94627818f6bfb03c8..0fc4d9740b4978fb5075be373a870db7cd7f31b8 100644
--- a/typo3/sysext/core/Documentation/Changelog/master/Index.rst
+++ b/typo3/sysext/core/Documentation/Changelog/master/Index.rst
@@ -1,7 +1,7 @@
 
 .. include:: ../../Includes.txt
 
-master changes
+master Changes
 ==============
 
 **Table of contents**
diff --git a/typo3/sysext/core/Documentation/Index.rst b/typo3/sysext/core/Documentation/Index.rst
index f41d9089b1717979c6d965761726258878999085..040170e3bec96f78baf14a90b7a4efc52bdf3f23 100644
--- a/typo3/sysext/core/Documentation/Index.rst
+++ b/typo3/sysext/core/Documentation/Index.rst
@@ -1,26 +1,19 @@
 
 .. include:: Includes.txt
 
-===========================
-TYPO3 CMS Core ChangeLog v8
-===========================
+========================
+TYPO3 CMS Core ChangeLog
+========================
 
 :Rendered: |today|
 
 Every change to the TYPO3 Core which might affect your site is documented here.
 
 .. toctree::
-   :hidden:
+   :titlesonly:
 
    Sitemap/Index
-   Changelog/master/Index
-   Changelog/9.0/Index
-   Changelog/8.7/Index
-   Changelog/8.6/Index
-   Changelog/8.5/Index
-   Changelog/8.4/Index
-   Changelog/8.3/Index
-   Changelog/8.2/Index
-   Changelog/8.1/Index
-   Changelog/8.0/Index
+   Master
+   Changelog-9
+   Changelog-8
    Changelog/Howto
diff --git a/typo3/sysext/core/Documentation/Master.rst b/typo3/sysext/core/Documentation/Master.rst
new file mode 100644
index 0000000000000000000000000000000000000000..b8a70a6eec969867ae2a5fde9ab897b7d5b2fc2e
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Master.rst
@@ -0,0 +1,14 @@
+:orphan:
+
+.. include:: Includes.txt
+
+================
+ChangeLog master
+================
+
+Every change to the TYPO3 Core which might affect your site is documented here.
+
+.. toctree::
+   :titlesonly:
+
+   Changelog/master/Index