diff --git a/frontend/device/kindle/device.lua b/frontend/device/kindle/device.lua
index 9cd602e0b..f3b7f7898 100644
--- a/frontend/device/kindle/device.lua
+++ b/frontend/device/kindle/device.lua
@@ -109,6 +109,7 @@ local KindleOasis = Kindle:new{
     model = "KindleOasis",
     isTouchDevice = yes,
     hasFrontlight = yes,
+    hasKeys = yes,
     display_dpi = 300,
     --[[
     -- NOTE: Points to event3 on WiFi devices, event4 on 3G devices...
@@ -339,10 +340,20 @@ function KindleOasis:init()
         is_charging_file = "/sys/devices/system/wario_charger/wario_charger0/charging",
     }
 
+    self.input = require("device/input"):new{
+        device = self,
+        
+        -- TODO: Physical buttons handle orientation?
+        event_map = {
+            [104] = "RPgFwd",
+            [109] = "RPgBack",
+        }
+    }
+
     Kindle.init(self)
 
     self.input.open(self.touch_dev)
-    -- TODO: Physical buttons?
+    self.input.open("/dev/input/by-path/platform-gpiokey.0-event")
     self.input.open("fake_events")
 end