diff --git a/ChangeLog b/ChangeLog
index a96a7596..1dc31040 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 <pre>
 2007-07-02:
 	* version ???
+	* new :map, :noremap, :mapclear and :unmap commands
 	* :saveas finally works (by calmar)
 	* Changed "|" to ", " as a url seperator in :open
 	* Ctrl-^ mapping for selecting the alternate tab/buffer
diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index 39b97960..96554440 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -617,7 +617,7 @@ function Commands() //{{{
         }
     ));
     // TODO: remove duplication in :map
-    addDefaultCommand(new Command(["noremap"],
+    addDefaultCommand(new Command(["no[remap]"],
         // 0 args -> list all maps
         // 1 arg  -> list the maps starting with args
         // 2 args -> map arg1 to arg*
@@ -665,7 +665,7 @@ function Commands() //{{{
             }
         },
         {
-            usage: ["noremap {lhs} {rhs}", "noremap {lhs}", "noremap"],
+            usage: ["no[remap] {lhs} {rhs}", "no[remap] {lhs}", "no[remap]"],
             short_help: "Map the key sequence {lhs} to {rhs}",
             help: "No remapping of the {rhs} is performed."
         }