diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9dd330e02..a737d7abc8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,12 +23,14 @@
 * Add is_empty to values and view_tags
 * Add manage.py upgrade script to combine migrate, download_vendor_files and collectstatic
 * Add GitLab provider and refactor GitHub provider
+* Make questionset id attribute explicit and migrate existing questionsets accordingly
+* Refactor theme creation
 * Remove caching for project questionsets, since the api is now project specific
 * Replace package csv by defusedcsv to prevent csv vulnerabilities
 * Fix title warning for questions modal
 * Fix continuation for catalog switch
 * Split project_detail_header template and add catalogs to project page
-* Allow for custome user models (in fresh instances)
+* Allow for custom user models (in fresh instances)
 * Optimize database access and increase overall performance
 
 ## RDMO 1.5.5 (Mar 25, 2021)
diff --git a/rdmo/__init__.py b/rdmo/__init__.py
index eb8e8ee90d..aa77acc737 100644
--- a/rdmo/__init__.py
+++ b/rdmo/__init__.py
@@ -1,5 +1,5 @@
 __title__ = 'rdmo'
-__version__ = '1.5.5'
+__version__ = '1.6-rc.1'
 __author__ = 'RDMO Arbeitsgemeinschaft'
 __email__ = 'rdmo-team@listserv.dfn.de'
 __license__ = 'Apache-2.0'