diff --git a/src/emu/input.cpp b/src/emu/input.cpp
index 360810a3b6c..592089cb221 100644
--- a/src/emu/input.cpp
+++ b/src/emu/input.cpp
@@ -240,6 +240,11 @@ static const code_string_table itemid_token_table[] =
 	{ ITEM_ID_F13,           "F13" },
 	{ ITEM_ID_F14,           "F14" },
 	{ ITEM_ID_F15,           "F15" },
+	{ ITEM_ID_F16,           "F16" },
+	{ ITEM_ID_F17,           "F17" },
+	{ ITEM_ID_F18,           "F18" },
+	{ ITEM_ID_F19,           "F19" },
+	{ ITEM_ID_F20,           "F20" },
 	{ ITEM_ID_ESC,           "ESC" },
 	{ ITEM_ID_TILDE,         "TILDE" },
 	{ ITEM_ID_MINUS,         "MINUS" },
diff --git a/src/emu/input.h b/src/emu/input.h
index a14f08099c0..d7012c1f779 100644
--- a/src/emu/input.h
+++ b/src/emu/input.h
@@ -141,6 +141,11 @@ enum input_item_id
 	ITEM_ID_F13,
 	ITEM_ID_F14,
 	ITEM_ID_F15,
+	ITEM_ID_F16,
+	ITEM_ID_F17,
+	ITEM_ID_F18,
+	ITEM_ID_F19,
+	ITEM_ID_F20,
 	ITEM_ID_ESC,
 	ITEM_ID_TILDE,
 	ITEM_ID_MINUS,
@@ -758,6 +763,11 @@ private:
 #define KEYCODE_F13_INDEXED(n) input_code(DEVICE_CLASS_KEYBOARD, n, ITEM_CLASS_SWITCH, ITEM_MODIFIER_NONE, ITEM_ID_F13)
 #define KEYCODE_F14_INDEXED(n) input_code(DEVICE_CLASS_KEYBOARD, n, ITEM_CLASS_SWITCH, ITEM_MODIFIER_NONE, ITEM_ID_F14)
 #define KEYCODE_F15_INDEXED(n) input_code(DEVICE_CLASS_KEYBOARD, n, ITEM_CLASS_SWITCH, ITEM_MODIFIER_NONE, ITEM_ID_F15)
+#define KEYCODE_F16_INDEXED(n) input_code(DEVICE_CLASS_KEYBOARD, n, ITEM_CLASS_SWITCH, ITEM_MODIFIER_NONE, ITEM_ID_F16)
+#define KEYCODE_F17_INDEXED(n) input_code(DEVICE_CLASS_KEYBOARD, n, ITEM_CLASS_SWITCH, ITEM_MODIFIER_NONE, ITEM_ID_F17)
+#define KEYCODE_F18_INDEXED(n) input_code(DEVICE_CLASS_KEYBOARD, n, ITEM_CLASS_SWITCH, ITEM_MODIFIER_NONE, ITEM_ID_F18)
+#define KEYCODE_F19_INDEXED(n) input_code(DEVICE_CLASS_KEYBOARD, n, ITEM_CLASS_SWITCH, ITEM_MODIFIER_NONE, ITEM_ID_F19)
+#define KEYCODE_F20_INDEXED(n) input_code(DEVICE_CLASS_KEYBOARD, n, ITEM_CLASS_SWITCH, ITEM_MODIFIER_NONE, ITEM_ID_F20)
 #define KEYCODE_ESC_INDEXED(n) input_code(DEVICE_CLASS_KEYBOARD, n, ITEM_CLASS_SWITCH, ITEM_MODIFIER_NONE, ITEM_ID_ESC)
 #define KEYCODE_TILDE_INDEXED(n) input_code(DEVICE_CLASS_KEYBOARD, n, ITEM_CLASS_SWITCH, ITEM_MODIFIER_NONE, ITEM_ID_TILDE)
 #define KEYCODE_MINUS_INDEXED(n) input_code(DEVICE_CLASS_KEYBOARD, n, ITEM_CLASS_SWITCH, ITEM_MODIFIER_NONE, ITEM_ID_MINUS)
@@ -868,6 +878,11 @@ private:
 #define KEYCODE_F13 KEYCODE_F13_INDEXED(0)
 #define KEYCODE_F14 KEYCODE_F14_INDEXED(0)
 #define KEYCODE_F15 KEYCODE_F15_INDEXED(0)
+#define KEYCODE_F16 KEYCODE_F16_INDEXED(0)
+#define KEYCODE_F17 KEYCODE_F17_INDEXED(0)
+#define KEYCODE_F18 KEYCODE_F18_INDEXED(0)
+#define KEYCODE_F19 KEYCODE_F19_INDEXED(0)
+#define KEYCODE_F20 KEYCODE_F20_INDEXED(0)
 #define KEYCODE_ESC KEYCODE_ESC_INDEXED(0)
 #define KEYCODE_TILDE KEYCODE_TILDE_INDEXED(0)
 #define KEYCODE_MINUS KEYCODE_MINUS_INDEXED(0)
diff --git a/src/emu/ioport.cpp b/src/emu/ioport.cpp
index 0590f22c71a..9720a2aba31 100644
--- a/src/emu/ioport.cpp
+++ b/src/emu/ioport.cpp
@@ -439,6 +439,11 @@ const char_info charinfo[] =
 	{ UCHAR_MAMEKEY(F13),       "F13",          nullptr },     // F13 function key
 	{ UCHAR_MAMEKEY(F14),       "F14",          nullptr },     // F14 function key
 	{ UCHAR_MAMEKEY(F15),       "F15",          nullptr },     // F15 function key
+	{ UCHAR_MAMEKEY(F16),       "F16",          nullptr },     // F16 function key
+	{ UCHAR_MAMEKEY(F17),       "F17",          nullptr },     // F17 function key
+	{ UCHAR_MAMEKEY(F18),       "F18",          nullptr },     // F18 function key
+	{ UCHAR_MAMEKEY(F19),       "F19",          nullptr },     // F19 function key
+	{ UCHAR_MAMEKEY(F20),       "F20",          nullptr },     // F20 function key
 	{ UCHAR_MAMEKEY(ESC),       "Esc",          "\033" },   // Esc key
 	{ UCHAR_MAMEKEY(INSERT),    "Insert",       nullptr },     // Insert key
 	{ UCHAR_MAMEKEY(DEL),       "Delete",       "\010" },   // Delete key