diff --git a/mode-key.c b/mode-key.c
index 3ee7fd76..97f33e66 100644
--- a/mode-key.c
+++ b/mode-key.c
@@ -1,4 +1,4 @@
-/* $Id: mode-key.c,v 1.30 2009-10-05 18:19:52 tcunha Exp $ */
+/* $Id: mode-key.c,v 1.31 2009-10-05 18:25:05 tcunha Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -155,9 +155,10 @@ struct mode_key_tree mode_key_tree_vi_choice;
 const struct mode_key_entry mode_key_vi_copy[] = {
 	{ ' ',			0, MODEKEYCOPY_STARTSELECTION },
 	{ '$',			0, MODEKEYCOPY_ENDOFLINE },
-	{ '/',			0, MODEKEYCOPY_SEARCHUP },
+	{ '/',			0, MODEKEYCOPY_SEARCHDOWN },
 	{ '0',			0, MODEKEYCOPY_STARTOFLINE },
-	{ '?',			0, MODEKEYCOPY_SEARCHDOWN },
+	{ ':',			0, MODEKEYCOPY_GOTOLINE },
+	{ '?',			0, MODEKEYCOPY_SEARCHUP },
 	{ '\002' /* C-b */,	0, MODEKEYCOPY_PREVIOUSPAGE },
 	{ '\003' /* C-c */,	0, MODEKEYCOPY_CANCEL },
 	{ '\004' /* C-d */,	0, MODEKEYCOPY_HALFPAGEDOWN },
@@ -168,7 +169,6 @@ const struct mode_key_entry mode_key_vi_copy[] = {
 	{ '\r',			0, MODEKEYCOPY_COPYSELECTION },
 	{ '^',			0, MODEKEYCOPY_BACKTOINDENTATION },
 	{ 'b',			0, MODEKEYCOPY_PREVIOUSWORD },
-	{ 'g',			0, MODEKEYCOPY_GOTOLINE },
 	{ 'h',			0, MODEKEYCOPY_LEFT },
 	{ 'j',			0, MODEKEYCOPY_DOWN },
 	{ 'k',			0, MODEKEYCOPY_UP },
diff --git a/tmux.1 b/tmux.1
index 400bcf70..ee7bd02c 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1,4 +1,4 @@
-.\" $Id: tmux.1,v 1.175 2009-10-05 18:21:58 tcunha Exp $
+.\" $Id: tmux.1,v 1.176 2009-10-05 18:25:05 tcunha Exp $
 .\"
 .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
 .\"
@@ -508,7 +508,7 @@ The following keys are supported as appropriate for the mode:
 .It Li "Delete entire line" Ta "d" Ta "C-u"
 .It Li "Delete to end of line" Ta "D" Ta "C-k"
 .It Li "End of line" Ta "$" Ta "C-e"
-.It Li "Goto line" Ta "g" Ta "g"
+.It Li "Goto line" Ta ":" Ta "g"
 .It Li "Next page" Ta "C-f" Ta "Page down"
 .It Li "Next word" Ta "w" Ta "M-f"
 .It Li "Paste buffer" Ta "p" Ta "C-y"