diff --git a/.github_changelog_generator b/.github_changelog_generator
index 52dbe73b..150569b5 100644
--- a/.github_changelog_generator
+++ b/.github_changelog_generator
@@ -1,3 +1,3 @@
 unreleased=true
-future-release=0.6
+future-release=0.6.1
 exclude-labels=duplicate,question,invalid,wontfix,release
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a27b8048..15a8b66a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Change Log
 
+## [0.6.1](https://github.com/kevinpapst/kimai2/tree/0.6.1) (2018-11-19)
+[Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.6...0.6.1)
+
+**Fixed bugs:**
+
+- Error importing v1 Database [\#428](https://github.com/kevinpapst/kimai2/issues/428)
+- Redo button missing? [\#426](https://github.com/kevinpapst/kimai2/issues/426)
+
+**Closed issues:**
+
+-  Error importing v1 Database \(could not convert to string\) [\#431](https://github.com/kevinpapst/kimai2/issues/431)
+
+**Merged pull requests:**
+
+- fix migration for MySQL [\#430](https://github.com/kevinpapst/kimai2/pull/430) ([kevinpapst](https://github.com/kevinpapst))
+- fix importer for MySQL [\#429](https://github.com/kevinpapst/kimai2/pull/429) ([kevinpapst](https://github.com/kevinpapst))
+
 ## [0.6](https://github.com/kevinpapst/kimai2/tree/0.6) (2018-11-18)
 [Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.5...0.6)
 
diff --git a/UPGRADING.md b/UPGRADING.md
index c027203d..c76f6cbc 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -18,6 +18,10 @@ bin/console doctrine:migrations:migrate
 There might be version specific tasks that need to be executed before or after these steps, please see below 
 if your updated version is mentioned below.
 
+## [0.6.1](https://github.com/kevinpapst/kimai2/releases/tag/0.6.1) (2018-11-19)
+
+A bugfix release to address database compatibility issues with older MySQL/MariaDB versions.
+
 ## [0.6](https://github.com/kevinpapst/kimai2/releases/tag/0.6) (2018-11-18)
 
 The API has some minor BC breaks: some fields were renamed and entities have a larger attribute set than collections. 
diff --git a/src/Constants.php b/src/Constants.php
index 5287368f..5c79d26a 100644
--- a/src/Constants.php
+++ b/src/Constants.php
@@ -17,7 +17,7 @@ class Constants
     /**
      * The current release version
      */
-    public const VERSION = 0.6;
+    public const VERSION = '0.6.1';
     /**
      * The release name, will only change for new major version
      */