diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6f7b8516..76d58fb67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.3.6
+
+- 81179951f458 Restrict deletes into the repository (#1973)
+- 066f06f4e713 Remind users to login again after password update (#1969)
+
 ## 2.3.5
 
 - 7755c7201d61 Update sprockets to fix cve-2018-3760
diff --git a/VERSION b/VERSION
index cc6c9a491..e75da3e63 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.5
+2.3.6