diff --git a/frontend/device/kindle/device.lua b/frontend/device/kindle/device.lua
index 2e7f15fcf..a81c35d3d 100644
--- a/frontend/device/kindle/device.lua
+++ b/frontend/device/kindle/device.lua
@@ -488,7 +488,7 @@ function Kindle3:init()
     }
     self.input = require("device/input"):new{
         device = self,
-        event_map = require("device/kindle/event_map_keyboard"),
+        event_map = require("device/kindle/event_map_kindle4"),
     }
     self.keyboard_layout = require("device/kindle/keyboard_layout")
     self.input.open("/dev/input/event0")
diff --git a/frontend/device/kindle/event_map_keyboard.lua b/frontend/device/kindle/event_map_keyboard.lua
index 1c6b64eb7..8dc7534ee 100644
--- a/frontend/device/kindle/event_map_keyboard.lua
+++ b/frontend/device/kindle/event_map_keyboard.lua
@@ -1,39 +1,30 @@
 --[[
-event map for Kindle devices with an alphabetic and/or alphanumeric keyboard
+event map for Kindle devices on FW 2.x
 --]]
 
 return {
     [2]  = "1", [3]  = "2", [4]  = "3", [5]  = "4", [6]  = "5", [7]  = "6", [8]  = "7", [9]  = "8", [10] = "9", [11] = "0",
     [16] = "Q", [17] = "W", [18] = "E", [19] = "R", [20] = "T", [21] = "Y", [22] = "U", [23] = "I", [24] = "O", [25] = "P",
     [30] = "A", [31] = "S", [32] = "D", [33] = "F", [34] = "G", [35] = "H", [36] = "J", [37] = "K", [38] = "L", [14] = "Del",
-    [44] = "Z", [45] = "X", [46] = "C", [47] = "V", [48] = "B", [49] = "N", [50] = "M", [52] = ".", [53] = "/", -- only KDX
+    [44] = "Z", [45] = "X", [46] = "C", [47] = "V", [48] = "B", [49] = "N", [50] = "M", [52] = ".", [53] = "/",
 
     [28] = "Press",
     [42] = "Shift",
     [56] = "Alt",
     [57] = " ",
-    [90] = "AA", -- KDX
-    [91] = "Back", -- KDX
-    [92] = "Press", -- KDX
-    [94] = "Sym", -- KDX
-    [98] = "Home", -- KDX
-    [102] = "Home", -- K[3] & k[4]
-    [104] = "LPgBack", -- K[3] only
-    [103] = "Up", -- K[3] & k[4]
+    [90] = "AA",
+    [91] = "Back",
+    [92] = "Press",
+    [94] = "Sym",
+    [98] = "Home",
+    [104] = "LPgFwd",
     [105] = "Left",
     [106] = "Right",
-    [108] = "Down", -- K[3] & k[4]
-    [109] = "RPgBack",
+    [109] = "LPgBack",
     [114] = "VMinus",
     [115] = "VPlus",
-    [122] = "Up", -- KDX
-    [123] = "Down", -- KDX
-    [124] = "RPgFwd", -- KDX
-    [126] = "Sym", -- K[3]
+    [122] = "Up",
+    [123] = "Down",
+    [124] = "RPgFwd",
     [139] = "Menu",
-    [158] = "Back", -- K[3] & K[4]
-    [190] = "AA", -- K[3]
-    [191] = "RPgFwd", -- K[3] & k[4]
-    [193] = "LPgFwd", -- K[3] only
-    [194] = "Press", -- K[3] & k[4]
 }
diff --git a/frontend/device/kindle/event_map_kindle4.lua b/frontend/device/kindle/event_map_kindle4.lua
index d4562ac80..25ff1dec4 100644
--- a/frontend/device/kindle/event_map_kindle4.lua
+++ b/frontend/device/kindle/event_map_kindle4.lua
@@ -1,9 +1,17 @@
 --[[
-event map for Kindle devices with control buttons & DPad
+event map for Kindle devices on FW 3.x & 4.x
 --]]
 
 return {
-    [29] = "ScreenKB",
+    [16] = "Q", [17] = "W", [18] = "E", [19] = "R", [20] = "T", [21] = "Y", [22] = "U", [23] = "I", [24] = "O", [25] = "P",
+    [30] = "A", [31] = "S", [32] = "D", [33] = "F", [34] = "G", [35] = "H", [36] = "J", [37] = "K", [38] = "L", [14] = "Del",
+    [44] = "Z", [45] = "X", [46] = "C", [47] = "V", [48] = "B", [49] = "N", [50] = "M", [52] = ".",
+
+    [28] = "Press", -- K3 (Enter)
+    [29] = "ScreenKB", -- K4
+    [42] = "Shift", -- K3
+    [56] = "Alt", -- K3
+    [57] = " ", -- K3
     [102] = "Home",
     [103] = "Up",
     [104] = "LPgFwd",
@@ -11,8 +19,10 @@ return {
     [106] = "Right",
     [108] = "Down",
     [109] = "RPgBack",
+    [126] = "Sym", -- K3
     [139] = "Menu",
     [158] = "Back",
+    [190] = "AA", -- K3
     [191] = "RPgFwd",
     [193] = "LPgBack",
     [194] = "Press",
diff --git a/frontend/device/kindle/keyboard_layout.lua b/frontend/device/kindle/keyboard_layout.lua
index f0931bbd4..b7dd8818a 100644
--- a/frontend/device/kindle/keyboard_layout.lua
+++ b/frontend/device/kindle/keyboard_layout.lua
@@ -9,6 +9,6 @@ return {
         "Z", "X", "C", "V", "B", "N", "M", ".", "Sym", "Enter",
     },
     [4] = {
-        "Sym", "Alt", "space", "Aa", "Home", "Back",
+        "Shift", "Alt", "space", "Aa", "Home", "Back",
     },
 }