diff --git a/CHANGELOG.md b/CHANGELOG.md
index e933c4877c6..43f7789f1aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,56 @@ CHANGELOG for PHP CS Fixer
 
 This file contains changelogs for stable releases only.
 
+Changelog for v2.16.4
+---------------------
+
+* bug #3893 Fix handling /** and */ on the same line as the first and/or last annotation (dmvdbrugge)
+* bug #4919 PhpUnitTestAnnotationFixer - fix function starting with "test" and having lowercase letter after (kubawerlos)
+* bug #4929 YodaStyleFixer - handling equals empty array (kubawerlos)
+* bug #4934 YodaStyleFixer - fix for conditions weird are (kubawerlos)
+* bug #4958 OrderedImportsFixer - fix for trailing comma in group (kubawerlos)
+* bug #4959 BlankLineBeforeStatementFixer - handle comment case (SpacePossum)
+* bug #4962 MethodArgumentSpaceFixer - must run after MethodChainingIndentationFixer (kubawerlos)
+* bug #4963 PhpdocToReturnTypeFixer - fix for breaking PHP syntax for type having reserved name (kubawerlos, Slamdunk)
+* bug #4978 ArrayIndentationFixer - must run after MethodArgumentSpaceFixer (kubawerlos)
+* bug #4994 FinalInternalClassFixer - must run before ProtectedToPrivateFixer (kubawerlos)
+* bug #4996 NoEmptyCommentFixer - handle multiline comments (kubawerlos)
+* bug #4999 BlankLineBeforeStatementFixer - better comment handling (SpacePossum)
+* bug #5009 NoEmptyCommentFixer - better handle comments sequence (kubawerlos)
+* bug #5010 SimplifiedNullReturnFixer - must run before VoidReturnFixer (kubawerlos)
+* bug #5011 SingleClassElementPerStatementFixer - must run before ClassAttributesSeparationFixer (kubawerlos)
+* bug #5012 StrictParamFixer - must run before NativeFunctionInvocationFixer (kubawerlos)
+* bug #5014 PhpdocToParamTypeFixer - fix for void as param (kubawerlos)
+* bug #5018 PhpdocScalarFixer - fix for comment with Windows line endings (kubawerlos)
+* bug #5029 SingleLineAfterImportsFixer - fix for line after import already added using CRLF (kubawerlos)
+* minor #4904 Increase PHPStan level to 8 with strict rules (julienfalque)
+* minor #4920 Enhancement: Use DocBlock itself to make it multi-line (localheinz)
+* minor #4930 DX: ensure PhpUnitNamespacedFixer handles all classes (kubawerlos)
+* minor #4931 DX: add test to ensure each target version in PhpUnitTargetVersion has its set in RuleSet (kubawerlos)
+* minor #4932 DX: Travis CI config - fix warnings and infos (kubawerlos)
+* minor #4940 Reject empty path (julienfalque)
+* minor #4944 Fix grammar (julienfalque)
+* minor #4946 Allow "const" option on PHP <7.1 (julienfalque)
+* minor #4948 Added describe command to readme (david, 8ctopus)
+* minor #4949 Fixed build readme on Windows fails if using Git Bash (Mintty) (8ctopus)
+* minor #4954 Config - Trim path (julienfalque)
+* minor #4957 DX: Check trailing spaces in project files only (ktomk)
+* minor #4961 Assert all project source files are monolithic. (SpacePossum)
+* minor #4964 Fix PHPStan baseline (julienfalque)
+* minor #4965 Fix PHPStan baseline (julienfalque)
+* minor #4973 DX: test "isRisky" method in fixer tests, not as auto review (kubawerlos)
+* minor #4974 Minor: Fix typo (ktomk)
+* minor #4975 Revert PHPStan level to 5 (julienfalque)
+* minor #4976 Add instructions for PHPStan (julienfalque)
+* minor #4980 Introduce new issue templates (julienfalque)
+* minor #4981 Prevent error in CTTest::testConstants (for PHP8) (guilliamxavier)
+* minor #4982 Remove PHIVE (kubawerlos)
+* minor #4985 Fix tests with Symfony 5.1 (julienfalque)
+* minor #4987 PhpdocAnnotationWithoutDotFixer - handle unicode characters using mb_* (SpacePossum)
+* minor #5008 Enhancement: Social justification applied (gbyrka-fingo)
+* minor #5023 Fix issue templates (kubawerlos)
+* minor #5024 DX: add missing non-default code samples (kubawerlos)
+
 Changelog for v2.16.3
 ---------------------
 
diff --git a/README.rst b/README.rst
index 10bf4824550..18074657878 100644
--- a/README.rst
+++ b/README.rst
@@ -46,7 +46,7 @@ or with specified version:
 
 .. code-block:: bash
 
-    $ wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.16.3/php-cs-fixer.phar -O php-cs-fixer
+    $ wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.16.4/php-cs-fixer.phar -O php-cs-fixer
 
 or with curl:
 
@@ -2026,7 +2026,7 @@ Config file
 
 Instead of using command line options to customize the rule, you can save the
 project configuration in a ``.php_cs.dist`` file in the root directory of your project.
-The file must return an instance of `PhpCsFixer\\ConfigInterface <https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/v2.16.3/src/ConfigInterface.php>`_
+The file must return an instance of `PhpCsFixer\\ConfigInterface <https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/v2.16.4/src/ConfigInterface.php>`_
 which lets you configure the rules, the files and directories that
 need to be analyzed. You may also create ``.php_cs`` file, which is
 the local configuration that will be used instead of the project configuration. It
diff --git a/src/Console/Application.php b/src/Console/Application.php
index 2d2efdf7100..697e94f4346 100644
--- a/src/Console/Application.php
+++ b/src/Console/Application.php
@@ -35,7 +35,7 @@
  */
 final class Application extends BaseApplication
 {
-    const VERSION = '2.16.4-DEV';
+    const VERSION = '2.16.4';
     const VERSION_CODENAME = 'Yellow Bird';
 
     /**