diff --git a/input-keys.c b/input-keys.c
index 68391147..eca7bcfc 100644
--- a/input-keys.c
+++ b/input-keys.c
@@ -1,4 +1,4 @@
-/* $Id: input-keys.c,v 1.25 2009-01-28 19:52:21 nicm Exp $ */
+/* $Id: input-keys.c,v 1.26 2009-03-02 18:05:40 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -49,6 +49,14 @@ struct input_key_ent input_keys[] = {
 	{ KEYC_F10,    "\033[21~", INPUTKEY_CTRL|INPUTKEY_XTERM },
 	{ KEYC_F11,    "\033[23~", INPUTKEY_CTRL|INPUTKEY_XTERM },
 	{ KEYC_F12,    "\033[24~", INPUTKEY_CTRL|INPUTKEY_XTERM },
+	{ KEYC_F13,    "\033[25~", INPUTKEY_CTRL|INPUTKEY_XTERM },
+	{ KEYC_F14,    "\033[26~", INPUTKEY_CTRL|INPUTKEY_XTERM },
+	{ KEYC_F15,    "\033[28~", INPUTKEY_CTRL|INPUTKEY_XTERM },
+	{ KEYC_F16,    "\033[29~", INPUTKEY_CTRL|INPUTKEY_XTERM },
+	{ KEYC_F17,    "\033[31~", INPUTKEY_CTRL|INPUTKEY_XTERM },
+	{ KEYC_F18,    "\033[32~", INPUTKEY_CTRL|INPUTKEY_XTERM },
+	{ KEYC_F19,    "\033[33~", INPUTKEY_CTRL|INPUTKEY_XTERM },
+	{ KEYC_F20,    "\033[34~", INPUTKEY_CTRL|INPUTKEY_XTERM },
 	{ KEYC_IC,     "\033[2~",  INPUTKEY_CTRL|INPUTKEY_XTERM },
 	{ KEYC_DC,     "\033[3~",  INPUTKEY_CTRL|INPUTKEY_XTERM },
 	{ KEYC_HOME,   "\033[1~",  INPUTKEY_CTRL|INPUTKEY_XTERM },
diff --git a/key-string.c b/key-string.c
index c2d0eab3..fe3e44a6 100644
--- a/key-string.c
+++ b/key-string.c
@@ -1,4 +1,4 @@
-/* $Id: key-string.c,v 1.16 2009-01-16 19:32:29 nicm Exp $ */
+/* $Id: key-string.c,v 1.17 2009-03-02 18:05:40 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -41,6 +41,14 @@ struct {
 	{ "F10",	KEYC_F10 },
 	{ "F11",	KEYC_F11 },
 	{ "F12",	KEYC_F12 },
+	{ "F13",	KEYC_F13 },
+	{ "F14",	KEYC_F14 },
+	{ "F15",	KEYC_F15 },
+	{ "F16",	KEYC_F16 },
+	{ "F17",	KEYC_F17 },
+	{ "F18",	KEYC_F18 },
+	{ "F19",	KEYC_F19 },
+	{ "F20",	KEYC_F20 },
 	{ "IC",		KEYC_IC },
 	{ "DC",		KEYC_DC },
 	{ "Home",	KEYC_HOME },
diff --git a/tmux.h b/tmux.h
index e2753d75..9d8e5266 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1,4 +1,4 @@
-/* $Id: tmux.h,v 1.275 2009-03-02 16:55:23 nicm Exp $ */
+/* $Id: tmux.h,v 1.276 2009-03-02 18:05:40 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -200,13 +200,21 @@ struct buffer {
 #define KEYC_F10 (KEYC_OFFSET + 0x10)
 #define KEYC_F11 (KEYC_OFFSET + 0x11)
 #define KEYC_F12 (KEYC_OFFSET + 0x12)
-#define KEYC_IC (KEYC_OFFSET + 0x13)
-#define KEYC_DC (KEYC_OFFSET + 0x14)
-#define KEYC_HOME (KEYC_OFFSET + 0x15)
-#define KEYC_END (KEYC_OFFSET + 0x16)
-#define KEYC_NPAGE (KEYC_OFFSET + 0x17)
-#define KEYC_PPAGE (KEYC_OFFSET + 0x18)
-#define KEYC_BTAB (KEYC_OFFSET + 0x19)
+#define KEYC_F13 (KEYC_OFFSET + 0x13)
+#define KEYC_F14 (KEYC_OFFSET + 0x14)
+#define KEYC_F15 (KEYC_OFFSET + 0x15)
+#define KEYC_F16 (KEYC_OFFSET + 0x16)
+#define KEYC_F17 (KEYC_OFFSET + 0x17)
+#define KEYC_F18 (KEYC_OFFSET + 0x18)
+#define KEYC_F19 (KEYC_OFFSET + 0x19)
+#define KEYC_F20 (KEYC_OFFSET + 0x1a)
+#define KEYC_IC (KEYC_OFFSET + 0x1b)
+#define KEYC_DC (KEYC_OFFSET + 0x1c)
+#define KEYC_HOME (KEYC_OFFSET + 0x1d)
+#define KEYC_END (KEYC_OFFSET + 0x1e)
+#define KEYC_NPAGE (KEYC_OFFSET + 0x1f)
+#define KEYC_PPAGE (KEYC_OFFSET + 0x20)
+#define KEYC_BTAB (KEYC_OFFSET + 0x21)
 
 /* Arrow keys. */
 #define KEYC_UP (KEYC_OFFSET + 0x50)
@@ -273,7 +281,15 @@ enum tty_code_code {
 	TTYC_KF1,	/* key_f1, k1 */
 	TTYC_KF10,	/* key_f10, k; */
 	TTYC_KF11,	/* key_f11, F1 */
-	TTYC_KF12,	/* key_f12, 21 */
+	TTYC_KF12,	/* key_f12, F2 */
+	TTYC_KF13,	/* key_f13, F3 */
+	TTYC_KF14,	/* key_f14, F4 */
+	TTYC_KF15,	/* key_f15, F5 */
+	TTYC_KF16,	/* key_f16, F6 */
+	TTYC_KF17,	/* key_f17, F7 */
+	TTYC_KF18,	/* key_f18, F8 */
+	TTYC_KF19,	/* key_f19, F9 */
+	TTYC_KF20,	/* key_f20, F10 */
 	TTYC_KF2,	/* key_f2, k2 */
 	TTYC_KF3,	/* key_f3, k3 */
 	TTYC_KF4,	/* key_f4, k4 */
diff --git a/tty-keys.c b/tty-keys.c
index 42494cc6..56299fc9 100644
--- a/tty-keys.c
+++ b/tty-keys.c
@@ -1,4 +1,4 @@
-/* $Id: tty-keys.c,v 1.23 2009-03-02 16:55:23 nicm Exp $ */
+/* $Id: tty-keys.c,v 1.24 2009-03-02 18:05:40 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -49,6 +49,14 @@ struct tty_key_ent tty_keys[] = {
 	{ TTYC_KF10,  NULL,     KEYC_F10,   TTYKEY_CTRL },
 	{ TTYC_KF11,  NULL,     KEYC_F11,   TTYKEY_CTRL },
 	{ TTYC_KF12,  NULL,     KEYC_F12,   TTYKEY_CTRL },
+	{ TTYC_KF13,  NULL,     KEYC_F13,   TTYKEY_CTRL },
+	{ TTYC_KF14,  NULL,     KEYC_F14,   TTYKEY_CTRL },
+	{ TTYC_KF15,  NULL,     KEYC_F15,   TTYKEY_CTRL },
+	{ TTYC_KF16,  NULL,     KEYC_F16,   TTYKEY_CTRL },
+	{ TTYC_KF17,  NULL,     KEYC_F17,   TTYKEY_CTRL },
+	{ TTYC_KF18,  NULL,     KEYC_F18,   TTYKEY_CTRL },
+	{ TTYC_KF19,  NULL,     KEYC_F19,   TTYKEY_CTRL },
+	{ TTYC_KF20,  NULL,     KEYC_F20,   TTYKEY_CTRL },
 	{ TTYC_KICH1, NULL,     KEYC_IC,    TTYKEY_CTRL },
 	{ TTYC_KDCH1, NULL,     KEYC_DC,    TTYKEY_CTRL },
 	{ TTYC_KHOME, NULL,     KEYC_HOME,  TTYKEY_CTRL },
diff --git a/tty-term.c b/tty-term.c
index 8405bfc7..55f44e40 100644
--- a/tty-term.c
+++ b/tty-term.c
@@ -1,4 +1,4 @@
-/* $Id: tty-term.c,v 1.15 2009-02-16 19:01:16 nicm Exp $ */
+/* $Id: tty-term.c,v 1.16 2009-03-02 18:05:40 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -70,6 +70,14 @@ struct tty_term_code_entry tty_term_codes[NTTYCODE] = {
 	{ TTYC_KF10, TTYCODE_STRING, "kf10" },
 	{ TTYC_KF11, TTYCODE_STRING, "kf11" },
 	{ TTYC_KF12, TTYCODE_STRING, "kf12" },
+	{ TTYC_KF13, TTYCODE_STRING, "kf13" },
+	{ TTYC_KF14, TTYCODE_STRING, "kf14" },
+	{ TTYC_KF15, TTYCODE_STRING, "kf15" },
+	{ TTYC_KF16, TTYCODE_STRING, "kf16" },
+	{ TTYC_KF17, TTYCODE_STRING, "kf17" },
+	{ TTYC_KF18, TTYCODE_STRING, "kf18" },
+	{ TTYC_KF19, TTYCODE_STRING, "kf19" },
+	{ TTYC_KF20, TTYCODE_STRING, "kf20" },
 	{ TTYC_KF2, TTYCODE_STRING, "kf2" },
 	{ TTYC_KF3, TTYCODE_STRING, "kf3" },
 	{ TTYC_KF4, TTYCODE_STRING, "kf4" },