diff --git a/Makefile b/Makefile
index 352621700..3892582c3 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,7 @@ MUPDFLIBDIR=$(MUPDFDIR)/$(MUPDFTARGET)
 SQLITE3DIR=sqlite-amalgamation-3070900
 LSQLITE3DIR=lsqlite3_svn08
 FREETYPEDIR=$(MUPDFDIR)/thirdparty/freetype-2.4.4
+LFSDIR=luafilesystem
 
 # set this to your ARM cross compiler:
 
@@ -55,7 +56,7 @@ SQLITE3LDFLAGS := -lpthread
 
 LUALIB := $(LUADIR)/src/liblua.a
 
-kpdfview: kpdfview.o einkfb.o pdf.o blitbuffer.o input.o util.o ft.o $(SQLITE3OBJS) $(MUPDFLIBS) $(THIRDPARTYLIBS) $(LUALIB)
+kpdfview: kpdfview.o einkfb.o pdf.o blitbuffer.o input.o util.o ft.o $(SQLITE3OBJS) lfs.o $(MUPDFLIBS) $(THIRDPARTYLIBS) $(LUALIB)
 	$(CC) -lm -ldl $(EMU_LDFLAGS) $(SQLITE3LDFLAGS) \
 		kpdfview.o \
 		einkfb.o \
@@ -65,6 +66,7 @@ kpdfview: kpdfview.o einkfb.o pdf.o blitbuffer.o input.o util.o ft.o $(SQLITE3OB
 		util.o \
 		ft.o \
 		$(SQLITE3OBJS) \
+		lfs.o \
 		$(MUPDFLIBS) \
 		$(THIRDPARTYLIBS) \
 		$(LUALIB) \
@@ -77,7 +79,7 @@ ft.o: %.o: %.c
 	$(CC) -c $(KPDFREADER_CFLAGS) -I$(FREETYPEDIR)/include $< -o $@
 
 kpdfview.o pdf.o blitbuffer.o util.o: %.o: %.c
-	$(CC) -c $(KPDFREADER_CFLAGS) $< -o $@
+	$(CC) -c $(KPDFREADER_CFLAGS) -I$(LFSDIR)/src $< -o $@
 
 sqlite3.o: $(SQLITE3DIR)/sqlite3.c
 	$(CC) -c $(CFLAGS) $(SQLITE3DIR)/sqlite3.c -o $@
@@ -85,6 +87,9 @@ sqlite3.o: $(SQLITE3DIR)/sqlite3.c
 lsqlite3.o: $(LSQLITE3DIR)/lsqlite3.c
 	$(CC) -c $(CFLAGS) -I$(LUADIR)/src -I$(SQLITE3DIR) $(LSQLITE3DIR)/lsqlite3.c -o $@
 
+lfs.o: $(LFSDIR)/src/lfs.c
+	$(CC) -c $(CFLAGS) -I$(LUADIR)/src -I$(LFSDIR)/src $(LFSDIR)/src/lfs.c -o $@
+
 fetchthirdparty:
 	-rmdir mupdf
 	-rmdir lua
@@ -94,6 +99,7 @@ fetchthirdparty:
 	wget http://www.lua.org/ftp/lua-5.1.4.tar.gz && tar xvzf lua-5.1.4.tar.gz && ln -s lua-5.1.4 lua
 	wget "http://lua.sqlite.org/index.cgi/zip/lsqlite3_svn08.zip?uuid=svn_8" && unzip "lsqlite3_svn08.zip?uuid=svn_8"
 	wget "http://sqlite.org/sqlite-amalgamation-3070900.zip" && unzip sqlite-amalgamation-3070900.zip
+	git clone https://github.com/keplerproject/luafilesystem.git
 
 clean:
 	-rm -f *.o kpdfview
diff --git a/kpdfview.c b/kpdfview.c
index 55f56517d..492d3d5b8 100644
--- a/kpdfview.c
+++ b/kpdfview.c
@@ -29,6 +29,8 @@
 #include "input.h"
 #include "ft.h"
 
+#include "lfs.h"
+
 /* forward declaration for luasqlite3: */
 LUALIB_API int luaopen_lsqlite3(lua_State *L);
 
@@ -55,6 +57,7 @@ int main(int argc, char **argv) {
 		luaopen_ft(L);
 
 		luaopen_lsqlite3(L);
+		luaopen_lfs(L);
 
 		lua_newtable(L);
 		for(i=2; i < argc; i++) {