diff --git a/frontend/document/picdocument.lua b/frontend/document/picdocument.lua
index 042e32578..d2827ca35 100644
--- a/frontend/document/picdocument.lua
+++ b/frontend/document/picdocument.lua
@@ -1,5 +1,6 @@
 local Document = require("document/document")
 local DrawContext = require("ffi/drawcontext")
+local pic = nil
 
 local PicDocument = Document:new{
     _document = false,
@@ -7,7 +8,7 @@ local PicDocument = Document:new{
 }
 
 function PicDocument:init()
-    require "libs/libkoreader-pic"
+    if not pic then pic = require("ffi/pic") end
     ok, self._document = pcall(pic.openDocument, self.file)
     if not ok then
         self.error_message = "failed to open jpeg image"
diff --git a/koreader-base b/koreader-base
index 9dc2c6b2a..9a9d69591 160000
--- a/koreader-base
+++ b/koreader-base
@@ -1 +1 @@
-Subproject commit 9dc2c6b2a2e15d47a17cb811182684a4ed272013
+Subproject commit 9a9d69591025c55123a3ed86f4ba6c54fd82132d