diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d81ab63e..4e86e28b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+# v0.9.6 beta
+## 11/17/2014
+
+1. [](#improved)
+    * Moved base_url variables into Grav container
+    * Forced media sorting to use natural sort order by default
+    * Various PSR code tidying
+    * Added filename, extension, thumb to all medium objects
+2. [](#bugfix)
+    * Fix for infinite loop in page.content()
+    * Fix hostname for configuration overrides
+    * Fix for cached configuration
+    * Fix for relative URLs in markdown on installs with no base_url
+    * Fix for page media images with uppercase extension
+
 # v0.9.5 beta
 ## 11/09/2014
 
diff --git a/system/defines.php b/system/defines.php
index 8e7b035ef..38b114b95 100644
--- a/system/defines.php
+++ b/system/defines.php
@@ -2,7 +2,7 @@
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '0.9.5');
+define('GRAV_VERSION', '0.9.6');
 define('DS', '/');
 
 // Directories and Paths