diff --git a/hw/slavio_serial.c b/hw/slavio_serial.c
index 37424c6cdd..1ef3c119e5 100644
--- a/hw/slavio_serial.c
+++ b/hw/slavio_serial.c
@@ -770,7 +770,7 @@ static const uint8_t e0_keycodes[128] = {
     0, 0, 0, 0, 0, 0, 0, 68, 69, 70, 0, 91, 0, 93, 0, 112,
     113, 114, 94, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    1, 3, 25, 26, 49, 52, 72, 73, 97, 99, 111, 118, 120, 122, 67, 0,
 };
 
 static void sunkbd_event(void *opaque, int ch)
diff --git a/monitor.c b/monitor.c
index 8154898673..914f4c6e32 100644
--- a/monitor.c
+++ b/monitor.c
@@ -904,6 +904,23 @@ static const KeyDef key_defs[] = {
 
     { 0xd2, "insert" },
     { 0xd3, "delete" },
+#if defined(TARGET_SPARC) && !defined(TARGET_SPARC64)
+    { 0xf0, "stop" },
+    { 0xf1, "again" },
+    { 0xf2, "props" },
+    { 0xf3, "undo" },
+    { 0xf4, "front" },
+    { 0xf5, "copy" },
+    { 0xf6, "open" },
+    { 0xf7, "paste" },
+    { 0xf8, "find" },
+    { 0xf9, "cut" },
+    { 0xfa, "lf" },
+    { 0xfb, "help" },
+    { 0xfc, "meta_l" },
+    { 0xfd, "meta_r" },
+    { 0xfe, "compose" },
+#endif
     { 0, NULL },
 };
 
diff --git a/target-sparc/TODO b/target-sparc/TODO
index 30c17c44da..0d39994b20 100644
--- a/target-sparc/TODO
+++ b/target-sparc/TODO
@@ -53,7 +53,6 @@ Sun4m:
 - Unimplemented features/bugs:
  - Hardware devices do not match real boards
  - Floppy does not work
- - Missing keys, sendkey support for all keys
  - CS4231: merge with cs4231a, add DMA
  - Add cg6, bwtwo
  - Arbitrary resolution support