diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 540ee78..c28f733 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -3,8 +3,8 @@ Change Log
 
 pycommand adheres to `Semantic Versioning <http://semver.org/>`_.
 
-Git version (next release)
---------------------------
+0.4.0 - 2018-03-27
+------------------
 
 Added
 #####
diff --git a/pycommand/pycommand.py b/pycommand/pycommand.py
index f97e5a4..e707b96 100644
--- a/pycommand/pycommand.py
+++ b/pycommand/pycommand.py
@@ -19,7 +19,7 @@
 __docformat__ = 'restructuredtext'
 __author__ = "Benjamin Althues"
 __copyright__ = "Copyright (C) 2013-2016, 2018  Benjamin Althues"
-__version_info__ = (0, 3, 0, 'beta', 0)
+__version_info__ = (0, 4, 0, 'final', 0)
 __version__ = '0.4.0'
 
 
diff --git a/setup.py b/setup.py
index cb8ffc1..b16e52a 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@
         ('share/pycommand', ['LICENSE', 'README.rst']),
     ],
     classifiers=[
-        'Development Status :: 4 - Beta',
+        'Development Status :: 5 - Production/Stable',
         'Environment :: Console',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: ISC License (ISCL)',