diff --git a/AUTHORS b/AUTHORS
index ed61a0354..49fbd4df8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -25,3 +25,4 @@ Authors of OpenSlides in chronological order of first contribution:
     Finn Stutzenstein <finn.stutzenstein@hotmail.de>
     Thomas Junk <lilith2k3@archlinux.us>
     Meinert Leinigen <openslides@leinigen.cc>
+    Andreas Engler <engel.a@web.de> (Russian translation)
diff --git a/CHANGELOG b/CHANGELOG
index 51be66794..5b9e06d2c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,7 +4,7 @@
 
 https://openslides.org/
 
-Version 2.1 (unreleased)
+Version 2.1 (2017-03-29)
 ========================
 [https://github.com/OpenSlides/OpenSlides/milestones/2.1]
 
diff --git a/openslides/__init__.py b/openslides/__init__.py
index d182ac0e6..068136dad 100644
--- a/openslides/__init__.py
+++ b/openslides/__init__.py
@@ -1,3 +1,3 @@
 __author__ = 'OpenSlides Team <support@openslides.org>'
 __description__ = 'Presentation and assembly system'
-__version__ = '2.1b5-dev'
+__version__ = '2.1'
diff --git a/setup.py b/setup.py
index 652159e30..acaf76802 100644
--- a/setup.py
+++ b/setup.py
@@ -25,14 +25,15 @@ setup(
     classifiers=[
         # http://pypi.python.org/pypi?%3Aaction=list_classifiers
         # 'Development Status :: 3 - Alpha',
-        'Development Status :: 4 - Beta',
-        # 'Development Status :: 5 - Production/Stable',
+        # 'Development Status :: 4 - Beta',
+        'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         'Framework :: Django',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5', ],
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6', ],
     packages=find_packages(exclude=['tests', 'tests.*']),
     include_package_data=True,
     install_requires=install_requires,