diff --git a/.gitattributes b/.gitattributes
index c45ae2eddf..1fde9d409d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -12,7 +12,7 @@
 .weblate export-ignore
 codecov.yml export-ignore
 infection.json5.dist export-ignore
-phpcs.xml.dist export-ignore
+phpcs.xml export-ignore
 phpstan.neon.dist export-ignore
 phpstan-baseline.neon export-ignore
 psalm.xml export-ignore
diff --git a/.gitignore b/.gitignore
index 7de13862d4..b040c07dce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,7 +57,6 @@ web.config
 revision-info.php
 
 # PHP_CodeSniffer
-phpcs.xml
 .phpcs-cache
 
 # PHPUnit
diff --git a/bin/internal/create-release.sh b/bin/internal/create-release.sh
index 6bc380d3be..aa943fed12 100755
--- a/bin/internal/create-release.sh
+++ b/bin/internal/create-release.sh
@@ -586,7 +586,7 @@ for kit in $KITS ; do
         # Template test files
         rm -r resources/templates/test/
         rm phpunit.xml
-        rm .editorconfig .browserslistrc .eslintignore .jshintrc .eslintrc.json .stylelintrc.json psalm.xml psalm-baseline.xml phpstan.neon.dist phpstan-baseline.neon phpcs.xml.dist jest.config.cjs infection.json5.dist .phpstorm.meta.php
+        rm .editorconfig .browserslistrc .eslintignore .jshintrc .eslintrc.json .stylelintrc.json psalm.xml psalm-baseline.xml phpstan.neon.dist phpstan-baseline.neon phpcs.xml jest.config.cjs infection.json5.dist .phpstorm.meta.php
         # Gettext po files (if they were not removed by ./bin/internal/lang-cleanup.sh)
         rm -rf resources/po
         # Documentation source code
diff --git a/phpcs.xml.dist b/phpcs.xml
similarity index 100%
rename from phpcs.xml.dist
rename to phpcs.xml