diff --git a/Makefile b/Makefile
index 133086cd..7d314af1 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 TOP           = $(shell pwd)
 
-VERSION       = 0.5
+VERSION       = 0.6
 OS            = $(shell uname -s)
 BUILD_DATE    = $(shell date "+%Y/%m/%d %H:%M:%S")
 
diff --git a/NEWS b/NEWS
index d63a5d8f..86d26236 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
 <pre>
+2007-xx-xx:
+	* version 0.6
+
 2007-08-16:
 	* version 0.5
+	* :map support (also :noremap, :unmap)
 	* :bmarks and :history now use the multiline message window for output
 	* rename :bm, :bmadd, and :bmdel to :bmarks, :bmark, and :delbmarks respectively
 	* new :normal command
diff --git a/chrome/content/vimperator/vimperator.js b/chrome/content/vimperator/vimperator.js
index 614ec948..1250709f 100644
--- a/chrome/content/vimperator/vimperator.js
+++ b/chrome/content/vimperator/vimperator.js
@@ -161,7 +161,7 @@ const vimperator = (function() //{{{
         //},
 
         // ###VERSION### and ###DATE### are replaced by the Makefile
-        version: "###VERSION### (created: ###DATE###)",
+        version: "###VERSION### CVS (created: ###DATE###)",
 
         input: {
             buffer: "",                // partial command storage