diff --git a/CHANGELOG b/CHANGELOG
index 250c5362b5ebaf6f0af0f2f7e8741b786a132c11..2265761be4cb5fc29c4ce516b904a48a8298a871 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,34 @@
+uffd (1.0.0) unstable; urgency=medium
+
+  [ nd ]
+  * enable more pylint checks
+  * disable all checks for ldapalchemy and enable duplicate code check
+  * disable cuplicate-code check in pylint again
+
+  [ Julian Rother ]
+  * Fixed typo in German translation (#91)
+  * Made shell context more usable and cleaned up imports in __init__.py
+
+  [ nd ]
+  * refactor selfservice mail sending
+
+  [ Julian Rother ]
+  * Disabled unhelpful deprecation warnings for pytest
+  * Fixed minor html validity error in qr code generation
+  * Moved token generation to common module and introduced token_urlfriendly
+  * Implemented ordering for navbar items
+  * Added api endpoint for mail aliases
+
+  [ Sistason ]
+  * Updated translations readme, made some editorial translation changes and fixed some typos
+
+  [ Julian Rother ]
+  * Made devicelogin button text easier to understand, closes #91
+  * Fixed layout bug in selfservice introduced by 7b94843b
+  * Changed developing status to "production/stable"
+
+ -- root <root@runner-f9u6bnzu-project-27-concurrent-0>  Fri, 13 Aug 2021 14:35:19 +0000
+
 uffd (0.3.0) unstable; urgency=medium
 
   [ nd ]
diff --git a/setup.py b/setup.py
index 9bbdc1b19b465c1d35c14528a519febe91de702b..c81960073a4d95aebcaf09c0ec9c708653382b2e 100644
--- a/setup.py
+++ b/setup.py
@@ -8,13 +8,13 @@ with open('README.md', 'r', encoding='utf-8') as f:
 setup(
 	name='uffd',
 	version=os.environ.get('PACKAGE_VERSION', 'local'),
-	description='UserFerwaltungsFrontend: Ldap based single sign on and user management web software',
+	description='Ldap based single sign on and user management web software',
 	long_description=long_description,
 	long_description_content_type='text/markdown',
 	url='https://git.cccv.de/uffd/uffd',
 	classifiers=[
 		'Programming Language :: Python :: 3',
-		'Development Status :: 4 - Beta',
+		'Development Status :: 5 - Production/Stable',
 		'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
 		'Operating System :: OS Independent',
 		'Topic :: System :: Systems Administration :: Authentication/Directory :: LDAP',