diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79e8e31b..3d61f1fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+### 0.23.1 (2016-05-11)
+- Add multi-container charts to the UI
+- Add TLS options for Kafka storage driver
+- Switch to official Docker client
+- Systemd:
+  - Ignore .mount cgroups on systemd
+  - Better OOM monitoring
+- Bug: Fix broken -disable_metrics flag
+- Bug: Fix openstack identified as AWS
+- Bug: Fix EventStore when limit is 0
+
 ### 0.23.0 (2016-04-21)
 - Docker v1.11 support
 - Preliminary rkt support
diff --git a/version/VERSION b/version/VERSION
index ca222b7c..610e2872 100644
--- a/version/VERSION
+++ b/version/VERSION
@@ -1 +1 @@
-0.23.0
+0.23.1