diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 42f1563..91b720e 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,15 +1,15 @@
 Changelog
 *********
 
-`Unreleased`_ (YYYY-MM-DD)
---------------------------
+`3.0.4`_ (2017-05-23)
+---------------------
 
-- ...
+- Fix CLI
 
 `3.0.2`_ (2017-05-12)
 ---------------------
 
 - Initial publication on PyPI
 
-.. _Unreleased: https://github.com/lgrahl/threema-msgapi-sdk-python/compare/v3.0.2...HEAD
+.. _3.0.4: https://github.com/lgrahl/threema-msgapi-sdk-python/compare/v3.0.2...v3.0.4
 .. _3.0.2: https://github.com/lgrahl/threema-msgapi-sdk-python/compare/e982c74cbe564c76cc58322d3154916ee7f6863b...v3.0.2
diff --git a/threema/gateway/__init__.py b/threema/gateway/__init__.py
index 896d114..4c5ae14 100644
--- a/threema/gateway/__init__.py
+++ b/threema/gateway/__init__.py
@@ -30,7 +30,7 @@
 
 __author__ = 'Lennart Grahl <lennart.grahl@gmail.com>'
 __status__ = 'Production'
-__version__ = '3.0.2'
+__version__ = '3.0.4'
 feature_level = 3
 
 __all__ = tuple(itertools.chain(