diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f1a1a8..35b6a38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 3.3.6 (2019-04-27)
+
+- [Bugfix] Fix KeyError on first quickstart
+- [Improvement] De-duplication of prod/dev settings. Thanks @silviot! 😺
+
 ## 3.3.5 (2019-04-22)
 
 - [Feature] Pluggable LMS/CMS/forum
diff --git a/tutor/__about__.py b/tutor/__about__.py
index c90ab1b..1549c12 100644
--- a/tutor/__about__.py
+++ b/tutor/__about__.py
@@ -1 +1 @@
-__version__ = "3.3.5"
+__version__ = "3.3.6"