diff --git a/frontend/device/android/device.lua b/frontend/device/android/device.lua
index 9fa6f269a..01b5fa306 100644
--- a/frontend/device/android/device.lua
+++ b/frontend/device/android/device.lua
@@ -131,9 +131,18 @@ local Device = Generic:new{
 function Device:init()
     self.screen = require("ffi/framebuffer_android"):new{device = self, debug = logger.dbg}
     self.powerd = require("device/android/powerd"):new{device = self}
+
+    local event_map = require("device/android/event_map")
+
+    if android.prop.is_tolino then
+        -- dpad left/right as page back/forward
+        event_map[21] = "LPgBack"
+        event_map[22] = "LPgFwd"
+    end
+
     self.input = require("device/input"):new{
         device = self,
-        event_map = require("device/android/event_map"),
+        event_map = event_map,
         handleMiscEv = function(this, ev)
             local Event = require("ui/event")
             local UIManager = require("ui/uimanager")
diff --git a/platform/android/luajit-launcher b/platform/android/luajit-launcher
index 503e295cf..a3540de98 160000
--- a/platform/android/luajit-launcher
+++ b/platform/android/luajit-launcher
@@ -1 +1 @@
-Subproject commit 503e295cfc4e73edbc56463888dd4f27e8c73b6f
+Subproject commit a3540de98b947c19733f18dda4211a031b1b03b4