diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fb102dc..e91408e6 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.21.1] - 2021-06-22
 
 ### Added
 
@@ -30,6 +30,10 @@ Given the high speed of development in the first phase, changes are being report
 - `switch.switchbot` plugin renamed to `switchbot.bluetooth` plugin, while the new plugin
   that uses the Switchbot API is simply named `switchbot`.
 
+### Fixed
+
+- More robust reconnection logic on the Pushbullet backend in case of websocket errors.
+
 ## [0.21.0] - 2021-05-06
 
 ### Added
diff --git a/platypush/__init__.py b/platypush/__init__.py
index c2890fb3..8474aabe 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.21.0'
+__version__ = '0.21.1'
 
 logger = logging.getLogger('platypush')
 
diff --git a/setup.cfg b/setup.cfg
index 1901c2a8..cb8555e1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.21.0
+current_version = 0.21.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 97956104..ed93fb53 100755
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ backend = pkg_files('platypush/backend')
 
 setup(
     name="platypush",
-    version="0.21.0",
+    version="0.21.1",
     author="Fabio Manganiello",
     author_email="info@fabiomanganiello.com",
     description="Platypush service",