diff --git a/CREDITS b/CREDITS
index 644b4ab59..a9053b04c 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2,7 +2,7 @@
 CREDITS
 =======
 
-Version 2.3.0
+Version 2.3.0/2.3.1
 -------------
 Martin Konecny (martin.konecny@sourcefabric.org)
   Role: Developer Team Lead
diff --git a/changelog b/changelog
index aff42ec52..eb92ef188 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,16 @@
+2.3.1 - March 19th, 2013
+  * Bug fixes
+    * Security fixes with running unescaped shell commands
+	* Fix backend services not coming back online if RabbitMQ crashed and
+	then restarted
+	* Fix uninstall not properly cleaning system
+	* Improved Services watchdog (test whether Services are running and
+	responding, not just running)
+	* Much faster library import (Silan analyzer runs in background)
+	* Fixed zombie process sometimes being created
+  * Other
+    * Upgrade to Mutagen (tag reader) 1.21 
+
 2.3.0 - Jan 21st, 2013
   * New features
     * Localization (Chinese, Czech, English, French, German, Italian, Korean,