diff --git a/src/keycode.h b/src/keycode.h
index b3246ec6..672d5d6d 100644
--- a/src/keycode.h
+++ b/src/keycode.h
@@ -42,6 +42,18 @@ enum _MMKeyCode {
 	K_F10 = kVK_F10,
 	K_F11 = kVK_F11,
 	K_F12 = kVK_F12,
+	K_F13 = kVK_F13,
+	K_F14 = kVK_F14,
+	K_F15 = kVK_F15,
+	K_F16 = kVK_F16,
+	K_F17 = kVK_F17,
+	K_F18 = kVK_F18,
+	K_F19 = kVK_F19,
+	K_F20 = kVK_F20,
+	K_F21 = K_NOT_A_KEY,
+	K_F22 = K_NOT_A_KEY,
+	K_F23 = K_NOT_A_KEY,
+	K_F24 = K_NOT_A_KEY,
 	K_META = kVK_Command,
 	K_ALT = kVK_Option,
 	K_CONTROL = kVK_Control,
@@ -117,6 +129,18 @@ enum _MMKeyCode {
 	K_F10 = XK_F10,
 	K_F11 = XK_F11,
 	K_F12 = XK_F12,
+	K_F13 = XK_F13,
+	K_F14 = XK_F14,
+	K_F15 = XK_F15,
+	K_F16 = XK_F16,
+	K_F17 = XK_F17,
+	K_F18 = XK_F18,
+	K_F19 = XK_F19,
+	K_F20 = XK_F20,
+	K_F21 = XK_F21,
+	K_F22 = XK_F22,
+	K_F23 = XK_F23,
+	K_F24 = XK_F24,
 	K_META = XK_Super_L,
 	K_ALT = XK_Alt_L,
 	K_CONTROL = XK_Control_L,
@@ -189,6 +213,18 @@ enum _MMKeyCode {
 	K_F10 = VK_F10,
 	K_F11 = VK_F11,
 	K_F12 = VK_F12,
+	K_F13 = VK_F13,
+	K_F14 = VK_F14,
+	K_F15 = VK_F15,
+	K_F16 = VK_F16,
+	K_F17 = VK_F17,
+	K_F18 = VK_F18,
+	K_F19 = VK_F19,
+	K_F20 = VK_F20,
+	K_F21 = VK_F21,
+	K_F22 = VK_F22,
+	K_F23 = VK_F23,
+	K_F24 = VK_F24,
 	K_META = VK_LWIN,
 	K_CONTROL = VK_CONTROL,
 	K_SHIFT = VK_SHIFT,
diff --git a/src/robotjs.cc b/src/robotjs.cc
index f1a1d311..c3cd1ca0 100644
--- a/src/robotjs.cc
+++ b/src/robotjs.cc
@@ -317,6 +317,18 @@ static KeyNames key_names[] =
 	{ "f10",            K_F10 },
 	{ "f11",            K_F11 },
 	{ "f12",            K_F12 },
+	{ "f13",            K_F13 },
+	{ "f14",            K_F14 },
+	{ "f15",            K_F15 },
+	{ "f16",            K_F16 },
+	{ "f17",            K_F17 },
+	{ "f18",            K_F18 },
+	{ "f19",            K_F19 },
+	{ "f20",            K_F20 },
+	{ "f21",            K_F21 },
+	{ "f22",            K_F22 },
+	{ "f23",            K_F23 },
+	{ "f24",            K_F24 },
 	{ "command",        K_META },
 	{ "alt",            K_ALT },
 	{ "control",        K_CONTROL },