diff --git a/frontend/ui/image.lua b/frontend/ui/image.lua
deleted file mode 100644
index 055fb8476..000000000
--- a/frontend/ui/image.lua
+++ /dev/null
@@ -1,25 +0,0 @@
-Image = {}
-
-function Image._getFileData(filename)
-	local f = io.open(filename)
-	local data = f:read("*a")
-	f:close()
-	return data
-end
-
-function Image.fromPNG(filename)
-	local img = mupdfimg.new()
-	img:loadPNGData(Image._getFileData(filename))
-	local bb = img:toBlitBuffer()
-	img:free()
-	return bb
-end
-
-function Image.fromJPEG(filename)
-	local img = mupdfimg.new()
-	img:loadJPEGData(Image._getFileData(filename))
-	local bb = img:toBlitBuffer()
-	img:free()
-	return bb
-end
-
diff --git a/frontend/ui/widget/base.lua b/frontend/ui/widget/base.lua
index b66b6e49d..27096b297 100644
--- a/frontend/ui/widget/base.lua
+++ b/frontend/ui/widget/base.lua
@@ -1,7 +1,6 @@
 require "ui/screen"
 require "ui/rendertext"
 require "ui/graphics"
-require "ui/image"
 require "ui/event"
 require "ui/gesturedetector"
 require "ui/font"
diff --git a/frontend/ui/widget/image.lua b/frontend/ui/widget/image.lua
index e4f94e0f7..36b8ae830 100644
--- a/frontend/ui/widget/image.lua
+++ b/frontend/ui/widget/image.lua
@@ -1,6 +1,4 @@
 require "ui/widget/base"
-require "ui/image"
-
 
 --[[
 ImageWidget shows an image from a file
@@ -16,9 +14,9 @@ ImageWidget = Widget:new{
 function ImageWidget:_render()
 	local itype = string.lower(string.match(self.file, ".+%.([^.]+)") or "")
 	if itype == "jpeg" or itype == "jpg" then
-		self._bb = Image.fromJPEG(self.file)
+		self._bb = Image:fromJPEG(self.file)
 	elseif itype == "png" then
-		self._bb = Image.fromPNG(self.file)
+		self._bb = Image:fromPNG(self.file)
 	end
 end
 
diff --git a/koreader-base b/koreader-base
index dbe989867..f406cec21 160000
--- a/koreader-base
+++ b/koreader-base
@@ -1 +1 @@
-Subproject commit dbe989867af6f187ad0ef40cc1bdae735ea9be86
+Subproject commit f406cec21ed62bd715853ed526658ae8ecbf6ae4