diff --git a/Build/Scripts/validateRstFiles.sh b/Build/Scripts/validateRstFiles.sh
index f0c19d7e5f58ea8d17d24bc646b6765dc85c6e9d..95c6496395fcdc80dc5a7c9a9b9f9296a0d7f884 100755
--- a/Build/Scripts/validateRstFiles.sh
+++ b/Build/Scripts/validateRstFiles.sh
@@ -50,7 +50,7 @@ for i in `find typo3/sysext/core/Documentation/Changelog -name "*.rst" -type f`;
         fi
 
         # All Deprecation- / Breaking- files since v9 must have one of the tags FullyScanned|PartiallyScanned|NotScanned
-        if ! [[ "$i" =~ (Changelog\/8\.[0-99]+\/|Changelog\/7\.[0-99]+\/|Changelog\/7\.6\.x\/|Changelog\/master\/Feature-|Changelog\/master\/Important-|Changelog\/[0-99]+\.[0-99]+\/Feature-|Changelog\/[0-99]+\.[0-99]+\/Important-) ]]; then
+        if ! [[ "$i" =~ (Changelog\/8\.[0-99]+\/|Changelog\/8\.7\.x\/|Changelog\/7\.[0-99]+\/|Changelog\/7\.6\.x\/|Changelog\/master\/Feature-|Changelog\/master\/Important-|Changelog\/[0-99]+\.[0-99]+\/Feature-|Changelog\/[0-99]+\.[0-99]+\/Important-) ]]; then
             if ! [[ "$fileContent" =~ ('.. index:: '.*(FullyScanned|PartiallyScanned|NotScanned)+.*) ]]; then
                 INDEX="missing FullyScanned / PartiallyScanned / NotScanned tag"
                 index_message="insert '.. index:: <at least one valid keyword and either FullyScanned, PartiallyScanned or NotScanned>' at last line of the file. See Build/Scripts/validateRstFiles.sh for allowed keywords"
diff --git a/typo3/sysext/core/Documentation/Changelog/8.7/Feature-78161-IntroduceTypoScriptFileExtension.rst b/typo3/sysext/core/Documentation/Changelog/8.7.x/Feature-78161-IntroduceTypoScriptFileExtension.rst
similarity index 100%
rename from typo3/sysext/core/Documentation/Changelog/8.7/Feature-78161-IntroduceTypoScriptFileExtension.rst
rename to typo3/sysext/core/Documentation/Changelog/8.7.x/Feature-78161-IntroduceTypoScriptFileExtension.rst
diff --git a/typo3/sysext/core/Documentation/Changelog/8.7/Important-23178-NewTYPO3_CONF_VARSOptionFEpageNotFound_handling_accessdeniedheader.rst b/typo3/sysext/core/Documentation/Changelog/8.7.x/Important-23178-NewTYPO3_CONF_VARSOptionFEpageNotFound_handling_accessdeniedheader.rst
similarity index 100%
rename from typo3/sysext/core/Documentation/Changelog/8.7/Important-23178-NewTYPO3_CONF_VARSOptionFEpageNotFound_handling_accessdeniedheader.rst
rename to typo3/sysext/core/Documentation/Changelog/8.7.x/Important-23178-NewTYPO3_CONF_VARSOptionFEpageNotFound_handling_accessdeniedheader.rst
diff --git a/typo3/sysext/core/Documentation/Changelog/8.7/Important-77830-CSC-HeaderLinkRespectsGlobalPageTarget.rst b/typo3/sysext/core/Documentation/Changelog/8.7.x/Important-77830-CSC-HeaderLinkRespectsGlobalPageTarget.rst
similarity index 100%
rename from typo3/sysext/core/Documentation/Changelog/8.7/Important-77830-CSC-HeaderLinkRespectsGlobalPageTarget.rst
rename to typo3/sysext/core/Documentation/Changelog/8.7.x/Important-77830-CSC-HeaderLinkRespectsGlobalPageTarget.rst
diff --git a/typo3/sysext/core/Documentation/Changelog/9.0/Important-81751-DbalCompatibleQuotingInTca.rst b/typo3/sysext/core/Documentation/Changelog/8.7.x/Important-81751-DbalCompatibleQuotingInTca.rst
similarity index 88%
rename from typo3/sysext/core/Documentation/Changelog/9.0/Important-81751-DbalCompatibleQuotingInTca.rst
rename to typo3/sysext/core/Documentation/Changelog/8.7.x/Important-81751-DbalCompatibleQuotingInTca.rst
index 105814a93cb6e6e4c15ab2f0ebd02861773e1b65..0de0d8012559bdd2eb876d0fa254b6f378a98aff 100644
--- a/typo3/sysext/core/Documentation/Changelog/9.0/Important-81751-DbalCompatibleQuotingInTca.rst
+++ b/typo3/sysext/core/Documentation/Changelog/8.7.x/Important-81751-DbalCompatibleQuotingInTca.rst
@@ -9,7 +9,7 @@ See :issue:`81751`
 Description
 ===========
 
-Names of tables and columns used in SQL fragments of `TCA` definitions need proper quoting to be compatible with different database drivers. The database
+Names of tables and columns used in SQL fragments of :php:`TCA` definitions need proper quoting to be compatible with different database drivers. The database
 framework of the core now applies proper quoting to table and column names if they are wrapped as :php:`{#tableName}.{#columnName}`
 
 It is advised to adapt extensions accordingly to run successfully on databases like PostgreSQL.
diff --git a/typo3/sysext/core/Documentation/Changelog/8.7/Important-82763-GlobalFluidExpressionNodeTypeAndTemplatePreProcessorConfiguration.rst b/typo3/sysext/core/Documentation/Changelog/8.7.x/Important-82763-GlobalFluidExpressionNodeTypeAndTemplatePreProcessorConfiguration.rst
similarity index 100%
rename from typo3/sysext/core/Documentation/Changelog/8.7/Important-82763-GlobalFluidExpressionNodeTypeAndTemplatePreProcessorConfiguration.rst
rename to typo3/sysext/core/Documentation/Changelog/8.7.x/Important-82763-GlobalFluidExpressionNodeTypeAndTemplatePreProcessorConfiguration.rst
diff --git a/typo3/sysext/core/Documentation/Changelog/8.7/Important-82794-AddedSysLanguageModeFallbackStop.rst b/typo3/sysext/core/Documentation/Changelog/8.7.x/Important-82794-AddedSysLanguageModeFallbackStop.rst
similarity index 100%
rename from typo3/sysext/core/Documentation/Changelog/8.7/Important-82794-AddedSysLanguageModeFallbackStop.rst
rename to typo3/sysext/core/Documentation/Changelog/8.7.x/Important-82794-AddedSysLanguageModeFallbackStop.rst