diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b2b815ec..e83b9a26c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,52 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [6.0.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v5.5.0...v6.0.0) (2019-08-30)
+
+
+### Bug Fixes
+
+* **datepicker:** fix selecting date from manual input in internal format ([8bdcc92](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/8bdcc92))
+* **datepicker:** format time on copy paste as well ([99d9efa](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/99d9efa))
+
+
+### Features
+
+* **allocations:** additional info and explanation for participants ([38949cf](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/38949cf))
+* **crontab:** cronjob for pruning expired invitations ([a9c5276](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/a9c5276))
+* **datepicker:** add option to change the position of the datepicker ([85f46ef](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/85f46ef))
+* **datepicker:** also parse manual input in internal format ([8a3ac72](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/8a3ac72))
+* **datepicker:** close datepicker on click outside ([88a6b85](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/88a6b85))
+* **datepicker:** close datepicker on escape keydown ([0e5707a](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/0e5707a))
+* **datepicker:** currently broken version using tail.datetime instead ([4282554](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/4282554))
+* **datepicker:** define instance collection singleton ([f5636b8](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/f5636b8))
+* **datepicker:** display datepicker on the right ([cbb7e95](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/cbb7e95))
+* **datepicker:** do not replace value if input is no valid date ([ecab0ac](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/ecab0ac))
+* **datepicker:** format according to input type; position datepicker ([db345ee](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/db345ee))
+* **datepicker:** format any dates before submission ([1eccb0e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/1eccb0e))
+* **datepicker:** format time on submit ([9f8749c](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/9f8749c))
+* **datepicker:** formatting dates for mass-inputs ([b9fd4d7](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/b9fd4d7))
+* **datepicker:** helper functions and updated tail.datetime fork ([2512d69](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/2512d69))
+* **datepicker:** more sane datetime config ([5a44263](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/5a44263))
+* **datepicker:** new approach stub for formatting dates in formdata ([9ea7b2e](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/9ea7b2e))
+* **datepicker:** only update datepicker date if date is valid ([d857af3](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/d857af3))
+* **datepicker:** switch to tail.datetime fork to fix time selection ([863971f](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/863971f))
+* **datepicker:** update dependencies ([427ffbf](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/427ffbf))
+* **invitations:** save expiresAt to DB ([1c2f2b7](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/1c2f2b7))
+* **ldap:** automatically synchronise user data from ldap ([b39ba8b](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/b39ba8b))
+* **navigate-away-prompt:** prompt on actual value change only ([293ab6d](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/293ab6d))
+* **schools:** implement cru ([18ae28a](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/18ae28a))
+* **user-schools:** allow users to override automatic school assoc' ([7d927fd](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/7d927fd))
+* **user-schools:** automatically assign users to schools ([12067de](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/12067de))
+* **users:** generalise UserLecturer and UserAdmin to UserFunction ([76f8da5](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/commit/76f8da5)), closes [#320](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/issues/320)
+
+
+### BREAKING CHANGES
+
+* **users:** Remove UserLecturer and UserAdmin
+
+
+
 ## [5.5.0](https://gitlab.cip.ifi.lmu.de/jost/UniWorX/compare/v5.4.0...v5.5.0) (2019-08-27)
 
 
diff --git a/package-lock.json b/package-lock.json
index d85f7a62f..e890bceb5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "5.5.0",
+  "version": "6.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4763d18f7..45d5a35b1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uni2work",
-  "version": "5.5.0",
+  "version": "6.0.0",
   "description": "",
   "keywords": [],
   "author": "",
diff --git a/package.yaml b/package.yaml
index cdeca6c8f..6ddad7316 100644
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
 name:    uniworx
-version: 5.5.0
+version: 6.0.0
 
 dependencies:
   # Due to a bug in GHC 8.0.1, we block its usage