diff --git a/Makefile b/Makefile
index bef6f9762..fa58ca393 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 VERSION=$(shell git describe HEAD)
 
 # subdirectory we use to build the installation bundle
-INSTALL_DIR=kindlepdfviewer
+INSTALL_DIR=koreader
 
 # files to copy from main directory
 LUA_FILES=reader.lua
@@ -34,7 +34,7 @@ customupdate: koreader-base/koreader-base koreader-base/extr
 	# ensure that the binaries were built for ARM
 	file koreader-base/koreader-base | grep ARM || exit 1
 	file koreader-base/extr | grep ARM || exit 1
-	rm -f kindlepdfviewer-$(VERSION).zip
+	rm -f koreader-$(VERSION).zip
 	rm -rf $(INSTALL_DIR)
 	mkdir -p $(INSTALL_DIR)/{history,screenshots,clipboard,libs}
 	cp -p README.md COPYING koreader-base/koreader-base koreader-base/extr kpdf.sh $(LUA_FILES) $(INSTALL_DIR)
@@ -45,9 +45,10 @@ customupdate: koreader-base/koreader-base koreader-base/extr
 	cp -rpL koreader-base/data/*.css $(INSTALL_DIR)/data
 	cp -rpL koreader-base/fonts $(INSTALL_DIR)
 	rm $(INSTALL_DIR)/fonts/droid/DroidSansFallbackFull.ttf
-	cp -r koreader-base/git-rev resources $(INSTALL_DIR)
+	echo $(VERSION) > git-rev
+	cp -r git-rev resources $(INSTALL_DIR)
 	cp -rpL frontend $(INSTALL_DIR)
 	mkdir $(INSTALL_DIR)/fonts/host
-	zip -9 -r kindlepdfviewer-$(VERSION).zip $(INSTALL_DIR) launchpad/ extensions/
+	zip -9 -r koreader-$(VERSION).zip $(INSTALL_DIR) launchpad/ extensions/
 	rm -rf $(INSTALL_DIR)
-	@echo "copy kindlepdfviewer-$(VERSION).zip to /mnt/us/customupdates and install with shift+shift+I"
+	@echo "copy koreader-$(VERSION).zip to /mnt/us/customupdates and install with shift+shift+I"
diff --git a/README.md b/README.md
index 4647f24e5..12be52db1 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,7 @@ Follow these steps:
 			* install CREngine sources into subfolder "kpvcrlib/crengine"
 			* install LuaJit sources into subfolder "luajit-2.0"
 			* install popen_noshell sources into subfolder "popen-noshell"
+			* install libk2pdfopt sources into subfolder "libk2pdfopt"
 
 	* automatically fetch thirdparty sources with Makefile:
 		* make sure you have patch, wget, unzip, git and svn installed
@@ -44,9 +45,9 @@ Follow these steps:
 * adapt Makefile to your needs - have a look at Makefile.defs in koreader-base
 
 * run `make thirdparty`. This will build MuPDF (plus the libraries it depends
-  on), libDjvuLibre, CREngine and Lua.
+  on), libDjvuLibre, CREngine, libk2pdfopt and Lua.
 
-* run `make`. This will build the kpdfview application
+* run `make`. This will build the koreader application
 
 
 Running
diff --git a/frontend/ui/font.lua b/frontend/ui/font.lua
index 8255fff24..3d9ec96cb 100644
--- a/frontend/ui/font.lua
+++ b/frontend/ui/font.lua
@@ -1,4 +1,4 @@
-require "settings" -- for DEBUG()
+require "dbg" -- for DEBUG()
 
 Font = {
 	fontmap = {