diff --git a/base b/base
index 2990edc63..6e399d647 160000
--- a/base
+++ b/base
@@ -1 +1 @@
-Subproject commit 2990edc63136da01aec322a327f1af0b36feb30c
+Subproject commit 6e399d64748e1f138bb2073fb77c127a0d3ff86d
diff --git a/frontend/device/generic/device.lua b/frontend/device/generic/device.lua
index 473bf2319..aef2bc734 100644
--- a/frontend/device/generic/device.lua
+++ b/frontend/device/generic/device.lua
@@ -49,10 +49,6 @@ function Device:init()
         self.powerd = require("device/generic/powerd"):new{device = self}
     end
 
-    if self.has_fake_events then
-        self.input.open("fake_events")
-    end
-
     if self.viewport then
         self.screen:setViewport(self.viewport)
         self.input:registerEventAdjustHook(
diff --git a/frontend/device/kindle/device.lua b/frontend/device/kindle/device.lua
index 9c7ffc074..1400dde56 100644
--- a/frontend/device/kindle/device.lua
+++ b/frontend/device/kindle/device.lua
@@ -35,7 +35,6 @@ local KindleTouch = Kindle:new{
     model = "KindleTouch",
     isTouchDevice = yes,
     touch_dev = "/dev/input/event3",
-    has_fake_events = true,
 }
 
 local KindlePaperWhite = Kindle:new{
@@ -44,7 +43,6 @@ local KindlePaperWhite = Kindle:new{
     hasFrontlight = yes,
     display_dpi = 212,
     touch_dev = "/dev/input/event0",
-    has_fake_events = true,
 }
 
 local KindlePaperWhite2 = Kindle:new{
@@ -53,7 +51,6 @@ local KindlePaperWhite2 = Kindle:new{
     hasFrontlight = yes,
     display_dpi = 212,
     touch_dev = "/dev/input/event1",
-    has_fake_events = true,
 }
 
 local KindleBasic = Kindle:new{
@@ -61,7 +58,6 @@ local KindleBasic = Kindle:new{
     isTouchDevice = yes,
     -- FIXME!
     touch_dev = "/dev/input/event0",
-    has_fake_events = true,
 }
 
 local KindleVoyage = Kindle:new{
@@ -70,7 +66,6 @@ local KindleVoyage = Kindle:new{
     hasFrontlight = yes,
     display_dpi = 300,
     touch_dev = "/dev/input/event1",
-    has_fake_events = true,
 }
 
 function Kindle2:init()
@@ -138,6 +133,7 @@ function KindleTouch:init()
     -- event1 in KindleTouch is "imx-yoshi Headset" (useless)
     self.input.open("/dev/input/event2") -- Home button
     self.input.open("/dev/input/event3") -- touchscreen
+    self.input.open("fake_events")
     Kindle.init(self)
 end
 
@@ -153,6 +149,7 @@ function KindlePaperWhite:init()
     Kindle.init(self)
 
     self.input.open("/dev/input/event0")
+    self.input.open("fake_events")
 end
 
 function KindlePaperWhite2:init()
@@ -167,6 +164,7 @@ function KindlePaperWhite2:init()
     Kindle.init(self)
 
     self.input.open("/dev/input/event1")
+    self.input.open("fake_events")
 end
 
 function KindleBasic:init()
@@ -181,6 +179,7 @@ function KindleBasic:init()
 
     -- FIXME!
     self.input.open("/dev/input/event0")
+    self.input.open("fake_events")
 end
 
 function KindleVoyage:init()
@@ -196,6 +195,7 @@ function KindleVoyage:init()
 
     self.input.open("/dev/input/event1")
     -- TODO: Handle the page turn 'buttons'! (/dev/input/event2)
+    self.input.open("fake_events")
 end
 
 --[[
diff --git a/frontend/document/picdocument.lua b/frontend/document/picdocument.lua
index 395b085fc..5b781e07c 100644
--- a/frontend/document/picdocument.lua
+++ b/frontend/document/picdocument.lua
@@ -17,11 +17,11 @@ function PicDocument:init()
     self.info.has_pages = true
     self.info.configurable = false
 
-    self:readMetadata()
+    self:_readMetadata()
 end
 
-function PicDocument:readMetadata()
-    self.info.number_of_pages = 1
+function PicDocument:getUsedBBox(pageno)
+    return { x0 = 0, y0 = 0, x1 = self._document.width, y1 = self._document.height }
 end
 
 function PicDocument:register(registry)