diff --git a/debian/changelog b/debian/changelog
index fc07a719..ba90eda7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+snuffleupagus (0.2.1) UNRELEASED; urgency=medium
+  * The testsuite can now be successfully run as root
+  * Fix a double execution when snuffleupagus is used with some other extensions
+  * Fix an execution-context related crash
+  * Support PCRE2, since it's required for PHP7.3
+  * Improve a bit the portability of the code
+  * Minor code simplification
+
+ -- jvoisin <snuffleupagus@nbs-system.com>  Tue, 07 Feb 2018 11:00:00 +0200
+
 snuffleupagus (0.2.0) UNRELEASED; urgency=medium
 
   * Glob support in `sp.configuration_file`
diff --git a/doc/source/changelog.rst b/doc/source/changelog.rst
index 5efb4cc8..8e476b12 100644
--- a/doc/source/changelog.rst
+++ b/doc/source/changelog.rst
@@ -1,6 +1,23 @@
 Changelog
 =========
 
+0.2.1 - `Elephant Point <https://github.com/nbs-system/snuffleupagus/releases/tag/v0.2.1>`__ 2018/02/07
+-------------------------------------------------------------------------------------------------------
+
+Bug fixes
+^^^^^^^^^
+
+- The testsuite can now be successfully run as root
+- Fix a double execution when snuffleupagus is used with some other extensions
+- Fix an execution-context related crash
+
+Improvements
+^^^^^^^^^^^^
+
+- Support PCRE2, since it's `required for PHP7.3 <https://wiki.php.net/rfc/pcre2-migration>`__
+- Improve a bit the portability of the code
+- Minor code simplification
+
 0.2.0 - `Elephant Rally <https://github.com/nbs-system/snuffleupagus/releases/tag/v0.2.0>`__ - 2018/01/18
 ---------------------------------------------------------------------------------------------------------
 
diff --git a/src/php_snuffleupagus.h b/src/php_snuffleupagus.h
index 52bcc931..27830e4e 100644
--- a/src/php_snuffleupagus.h
+++ b/src/php_snuffleupagus.h
@@ -1,7 +1,7 @@
 #ifndef PHP_SNUFFLEUPAGUS_H
 #define PHP_SNUFFLEUPAGUS_H
 
-#define PHP_SNUFFLEUPAGUS_VERSION "0.2.1-dev"
+#define PHP_SNUFFLEUPAGUS_VERSION "0.2.1"
 #define PHP_SNUFFLEUPAGUS_EXTNAME "snuffleupagus"
 #define PHP_SNUFFLEUPAGUS_AUTHOR "NBS System"
 #define PHP_SNUFFLEUPAGUS_URL "https://github.com/nbs-system/snuffleupagus"