diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9443c36d..9de1d811d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 Given the high speed of development in the first phase, changes are being reported only starting from v0.20.2.
 
-## [Unreleased]
+## [0.20.6] - 2021-03-16
 
 ### Added
 
@@ -17,6 +17,12 @@ Given the high speed of development in the first phase, changes are being report
 
 - Removed legacy `pusher` script and `local` backend.
 
+### Fixed
+
+- Fixed support for Z-Wave switches.
+
+- Fixed possible race condition on VLC stop.
+
 ## [0.20.5] - 2021-03-12
 
 ### Added
diff --git a/platypush/__init__.py b/platypush/__init__.py
index f44a4472c..dac681f0c 100644
--- a/platypush/__init__.py
+++ b/platypush/__init__.py
@@ -24,7 +24,7 @@ from .utils import set_thread_name
 
 
 __author__ = 'Fabio Manganiello <info@fabiomanganiello.com>'
-__version__ = '0.20.5'
+__version__ = '0.20.6'
 
 logger = logging.getLogger('platypush')
 
diff --git a/setup.cfg b/setup.cfg
index 60a7c1e87..cd7b35636 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.20.5
+current_version = 0.20.6
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 4a595bd50..e6410f044 100755
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ backend = pkg_files('platypush/backend')
 
 setup(
     name="platypush",
-    version="0.20.5",
+    version="0.20.6",
     author="Fabio Manganiello",
     author_email="info@fabiomanganiello.com",
     description="Platypush service",