diff --git a/AUTHORS b/AUTHORS
index be090601..138835a6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -18,4 +18,5 @@ Patches:
   * Nikolai Weibull ($VIMPERATOR_HOME)
   * Joseph Xu (supporting multiple top level windows better)
   * Raimon Grau Cuscó (document relationship navigation - ]n, ]p)
+  * Ryan Zheng (ctrl-x/a support)
 </pre>
diff --git a/Donators b/Donators
index 470f8d7b..3d5e9d42 100644
--- a/Donators
+++ b/Donators
@@ -3,6 +3,7 @@
 
 2007 (most recent donators first):
 
+* David Thompson
 * Christian Walther
 * Ivo-Jose Jimenez-Ramos
 * Robert Heckel
diff --git a/NEWS b/NEWS
index 679d7647..9879bc55 100644
--- a/NEWS
+++ b/NEWS
@@ -16,7 +16,7 @@
 	* new :cd and :pwd commands
     * new :dialog command to open various firefox dialogs
 	* new a and A mappings to deal with bookmarks
-	* added ]n and ]p to navigate to the next/previous document based on
+	* added ]] and [[ to navigate to the next/previous document based on
 	  the regexp specified in 'nextpattern' and 'previouspattern' (thanks kidd)
 	* abbreviations for text fields (:abbr etc.) (thanks calmar)
 	* you can edit textfields with Ctrl-i now using an external editor (thanks to Joseph Xu)
diff --git a/content/mappings.js b/content/mappings.js
index c499b76b..ea647e80 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -422,7 +422,7 @@ vimperator.Mappings = function () //{{{
             flags: vimperator.Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["]n"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["]]"],
         function (count) { vimperator.buffer.followDocumentRelationship("next"); },
         {
             shortHelp: "go to 'next' or '>' if it exists.  Beep otherwise.",
@@ -430,7 +430,7 @@ vimperator.Mappings = function () //{{{
             flags: vimperator.Mappings.flags.COUNT
         }
     ));
-    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["]p"],
+    addDefaultMap(new vimperator.Map([vimperator.modes.NORMAL], ["[["],
         function (count) { vimperator.buffer.followDocumentRelationship("previous"); },
         {
             shortHelp: "go to 'prev', 'previous' or '<' if it exists.  Beep otherwise.",