diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd430c30..31f1f2fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,12 @@
 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.
 
+## [0.21.4] - 2021-08-24
+
+### Fixed
+
+- Fixed JWT token generation, since python-jwt >= 2.0 always returns strings (not bytes) upon `jwt.encode`.
+
 ## [0.21.3] - 2021-07-28
 
 ### Added
diff --git a/platypush/__init__.py b/platypush/__init__.py
index 4d4caf65..a3954bd2 100644
--- a/platypush/__init__.py
+++ b/platypush/__init__.py
@@ -23,7 +23,7 @@ from .message.response import Response
 from .utils import set_thread_name, get_enabled_plugins
 
 __author__ = 'Fabio Manganiello <info@fabiomanganiello.com>'
-__version__ = '0.21.3'
+__version__ = '0.21.4'
 
 logger = logging.getLogger('platypush')
 
diff --git a/setup.cfg b/setup.cfg
index 54d0a135..c0438c23 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.21.3
+current_version = 0.21.4
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index c0a8b138..d93a4e66 100755
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ backend = pkg_files('platypush/backend')
 
 setup(
     name="platypush",
-    version="0.21.3",
+    version="0.21.4",
     author="Fabio Manganiello",
     author_email="info@fabiomanganiello.com",
     description="Platypush service",