diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73ce8bd675..be0ee9e434 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,15 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](http://keepachangelog.com)
+The format based on [Keep a Changelog](http://keepachangelog.com)
 and this project adheres to [Semantic Versioning](http://semver.org).
 
 ## [Unreleased]
+
+## [0.12.21] - 2021-03-05
+### Fixed
+- Fixed path separators in generated `config.m4` file on Windows [#2153](https://github.com/phalcon/zephir/issues/2153)
+
 ## [0.12.20] - 2020-12-16
 ### Added
 - Added supports void type return value for stubs
@@ -15,8 +20,6 @@ and this project adheres to [Semantic Versioning](http://semver.org).
 - Fixed missing kernel directory at build time [ice/framework#271](https://github.com/ice/framework/issues/271)
 - Fixed stubs generation for case with array declaration with square brackets in params
 - Fixed parameters positioning for `implode()` php function [#2120](https://github.com/phalcon/zephir/issues/2120)
-- Fixed path separators in generated `config.m4` file on Windows [#2153](https://github.com/phalcon/zephir/issues/2153)
-
 
 ## [0.12.19] - 2020-05-13
 ### Fixed
@@ -423,7 +426,8 @@ and this project adheres to [Semantic Versioning](http://semver.org).
 - Fixed casting resource to int (only ZendEngine 3)
   [#1524](https://github.com/phalcon/zephir/issues/1524)
 
-[Unreleased]: https://github.com/phalcon/zephir/compare/0.12.20...HEAD
+[Unreleased]: https://github.com/phalcon/zephir/compare/0.12.21...HEAD
+[0.12.21]: https://github.com/phalcon/zephir/compare/0.12.20...0.12.21
 [0.12.20]: https://github.com/phalcon/zephir/compare/0.12.19...0.12.20
 [0.12.19]: https://github.com/phalcon/zephir/compare/0.12.18...0.12.19
 [0.12.18]: https://github.com/phalcon/zephir/compare/0.12.17...0.12.18
diff --git a/Library/Zephir.php b/Library/Zephir.php
index 58342a5ceb..e6b0f8510a 100644
--- a/Library/Zephir.php
+++ b/Library/Zephir.php
@@ -16,7 +16,7 @@
  */
 final class Zephir
 {
-    const VERSION = '0.12.20-$Id$';
+    const VERSION = '0.12.21-$Id$';
 
     const LOGO = <<<'ASCII'
  _____              __    _
diff --git a/ext/php_stub.h b/ext/php_stub.h
index 8ff72cf0a2..cc232ffcef 100644
--- a/ext/php_stub.h
+++ b/ext/php_stub.h
@@ -14,7 +14,7 @@
 #define PHP_STUB_VERSION     "1.0.0"
 #define PHP_STUB_EXTNAME     "stub"
 #define PHP_STUB_AUTHOR      "Phalcon Team and contributors"
-#define PHP_STUB_ZEPVERSION  "0.12.20-$Id$"
+#define PHP_STUB_ZEPVERSION  "0.12.21-$Id$"
 #define PHP_STUB_DESCRIPTION "Description <b>test</b> for<br/>Test Extension."
 
 typedef struct _zephir_struct_db {