diff --git a/CHANGELOG b/CHANGELOG
index b26f0f773..3abf804c8 100755
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,17 @@
+* 0.17
+
+New features:
+* Ability to rename pages
+* Ability to redirect Wikilinks, using
+    [[!redirect ...]]
+* HTTP 302 redirects, for redirected/renamed pages
+
+Bugs Fixed:
+* Rails gets very unhappy with "." in page or author names.
+  Make sure that doesn't happen.
+* Fix a Maruku escaping bug.
+
+------------------------------------------------------------------------------
 * 0.16.6
 
 New Features:
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 7191726dd..7db0049ac 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -257,8 +257,8 @@ def charset=(encoding)
 module Instiki
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 16
-    TINY  = 6 
+    MINOR = 17
+    TINY  = 0 
     SUFFIX = '(MML+)'
     PRERELEASE =  false
     if PRERELEASE