diff --git a/CHANGES b/CHANGES
index e7f01378..91e89982 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 04 June 2008
 
+* Add some vi(1) key bindings in copy mode, and support binding ^[, ^\, ^]
+  ^^ and ^_. Both from/prompted by Will Maier.
 * setw monitor-activity and set status without arguments now toggle the current
   value; suggested by merdely.
 * New command set-window-option (alias setw) to set the single current window
@@ -401,4 +403,4 @@
   (including mutt, emacs). No status bar yet and no key remapping or other
   customisation.
 
-$Id: CHANGES,v 1.108 2008-06-04 18:34:56 nicm Exp $
+$Id: CHANGES,v 1.109 2008-06-04 20:01:35 nicm Exp $
diff --git a/key-string.c b/key-string.c
index 73952512..e2d03a2f 100644
--- a/key-string.c
+++ b/key-string.c
@@ -1,4 +1,4 @@
-/* $Id: key-string.c,v 1.4 2007-11-09 17:09:34 nicm Exp $ */
+/* $Id: key-string.c,v 1.5 2008-06-04 20:01:36 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -201,6 +201,11 @@ struct {
 	{ "^X",		24 },
 	{ "^Y",		25 },
 	{ "^Z",		26 },
+	{ "^[",		27 },
+	{ "^\\",	28 },
+	{ "^]",		29 },
+	{ "^^",		30 },
+	{ "^_",		31 }
 };
 #define NKEYSTRINGS (sizeof key_string_table / sizeof key_string_table[0])