diff --git a/Makefile b/Makefile
index 44dec6efc..557293ea8 100644
--- a/Makefile
+++ b/Makefile
@@ -135,6 +135,7 @@ cleanthirdparty:
 	make -C $(CRENGINEDIR)/thirdparty/chmlib clean
 	make -C $(CRENGINEDIR)/thirdparty/libpng clean
 	make -C $(CRENGINEDIR)/crengine clean
+	make -C $(KPVCRLIGDIR) clean
 	-rm -rf $(DJVUDIR)/build
 	-rm -f $(MUPDFDIR)/fontdump.host
 	-rm -f $(MUPDFDIR)/cmapdump.host
@@ -164,7 +165,7 @@ endif
 
 $(CRENGINELIBS):
 	cd $(KPVCRLIGDIR) && rm -rf CMakeCache.txt CMakeFiles && \
-		CFLAGS="$(CFLAGS)" CC="$(CC)" CXX="$(CXX)" cmake . && \
+		CC="$(CC)" CXX="$(CXX)" cmake . && \
 		make
 
 $(LUALIB):
@@ -185,6 +186,8 @@ customupdate: kpdfview
 	file kpdfview | grep ARM || exit 1
 	mkdir $(INSTALL_DIR)
 	cp -p README.TXT COPYING kpdfview *.lua $(INSTALL_DIR)
+	cp -rpL data $(INSTALL_DIR)
+	cp -rp fonts $(INSTALL_DIR)
 	zip -r kindlepdfviewer-$(VERSION).zip $(INSTALL_DIR) launchpad/
 	rm -Rf $(INSTALL_DIR)
 	@echo "copy kindlepdfviewer-$(VERSION).zip to /mnt/us/customupdates and install with shift+shift+I"
diff --git a/kpvcrlib/CMakeLists.txt b/kpvcrlib/CMakeLists.txt
index 8e325b2e0..19bafa56b 100644
--- a/kpvcrlib/CMakeLists.txt
+++ b/kpvcrlib/CMakeLists.txt
@@ -1,19 +1,22 @@
 PROJECT(kpvcrlib)
 cmake_minimum_required(VERSION 2.6)
 
+SET(MUPDF_DIR ../mupdf)
+SET(MUPDF_3RDPARTY_DIR ${MUPDF_DIR}/thirdparty)
 SET(CR_3RDPARTY_DIR crengine/thirdparty)
-SET(MUPDF_3RDPARTY_DIR ../mupdf/thirdparty)
 
 SET(CR3_PNG 1)
-SET(CR3_JPEG 1)
+#SET(CR3_JPEG 1)
 
 SET(FREETYPE_INCLUDE_DIRS ${CR_3RDPARTY_DIR}/freetype/include)
 SET(ANTIWORD_INCLUDE_DIR ${CR_3RDPARTY_DIR}/antiword)
 SET(CHM_INCLUDE_DIRS ${CR_3RDPARTY_DIR}/chmlib)
 SET(PNG_INCLUDE_DIR ${CR_3RDPARTY_DIR}/libpng)
 SET(ZLIB_INCLUDE_DIR ${MUPDF_3RDPARTY_DIR}/zlib-1.2.5)
+#SET(ZLIB_INCLUDE_DIR ${CR_3RDPARTY_DIR}/zlib)
 SET(JPEGLIB_INCLUDE_DIR ${MUPDF_3RDPARTY_DIR}/jpeg-8d)
 #SET(JPEGLIB_INCLUDE_DIR ${CR_3RDPARTY_DIR}/libjpeg)
+SET(JCONFIG_INCLUDE_DIR ${MUPDF_DIR}/scripts)
 
 INCLUDE_DIRECTORIES(
 	${FREETYPE_INCLUDE_DIRS}
@@ -22,6 +25,7 @@ INCLUDE_DIRECTORIES(
 	${PNG_INCLUDE_DIR} 
 	${ZLIB_INCLUDE_DIR}
 	${JPEGLIB_INCLUDE_DIR}
+	${JCONFIG_INCLUDE_DIR}
 )
 
 ADD_DEFINITIONS(-DUSE_FONTCONFIG=0 -DUSE_FREETYPE=1 -DCR3_PATCH=1 -DNDEBUG=1)
@@ -42,6 +46,6 @@ ADD_DEFINITIONS(-DCR3_ANTIWORD_PATCH=1)
 ADD_SUBDIRECTORY(${CR_3RDPARTY_DIR}/antiword)
 
 SET(GUI kpv)
-ADD_DEFINITIONS(-DJCONFIG_INCLUDE=1)
+#ADD_DEFINITIONS(-DJCONFIG_INCLUDED=1)
 ADD_SUBDIRECTORY(crengine/crengine)