diff --git a/Makefile b/Makefile
index d8ac2c79b..1c06b9821 100644
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,11 @@ KOR_BASE?=koreader-base
 
 # we want VERSION to carry the version of koreader, not koreader-base
 VERSION=$(shell git describe HEAD)
+REVISION=$(shell git rev-parse --short HEAD)
 
 # subdirectory we use to build the installation bundle
+export PATH:=$(CURDIR)/$(KOR_BASE)/toolchain/android-toolchain/bin:$(PATH)
+MACHINE?=$(shell PATH=$(PATH) $(CC) -dumpmachine 2>/dev/null)
 INSTALL_DIR=koreader-$(MACHINE)
 
 # files to link from main directory
@@ -22,7 +25,7 @@ KOREADER_MISC_TOOL=../misc
 XGETTEXT_BIN=$(KOREADER_MISC_TOOL)/gettext/lua_xgettext.py
 
 
-all: $(KOR_BASE)/$(OUTPUT_DIR)/luajit po
+all: $(if $(ANDROID),,$(KOR_BASE)/$(OUTPUT_DIR)/luajit) po
 	$(MAKE) -C $(KOR_BASE)
 	echo $(VERSION) > git-rev
 	mkdir -p $(INSTALL_DIR)/koreader
@@ -31,15 +34,15 @@ ifdef EMULATE_READER
 	# create symlink instead of copying files in development mode
 	cd $(INSTALL_DIR)/koreader && \
 		ln -sf ../../$(KOR_BASE)/$(OUTPUT_DIR)/* .
+	# install front spec
+	cd $(INSTALL_DIR)/koreader/spec && test -e front || \
+		ln -sf ../../../../spec ./front
 else
 	cp -rfL $(KOR_BASE)/$(OUTPUT_DIR)/* $(INSTALL_DIR)/koreader/
 endif
 	for f in $(INSTALL_FILES); do \
 		ln -sf ../../$$f $(INSTALL_DIR)/koreader/; \
 	done
-	# install front spec
-	cd $(INSTALL_DIR)/koreader/spec && test -e front || \
-		ln -sf ../../../../spec ./front
 	cd $(INSTALL_DIR)/koreader/spec/front/unit && test -e data || \
 		ln -sf ../../test ./data
 	# install plugins
@@ -118,6 +121,10 @@ koboupdate: all
 			KoboRoot.tgz koreader koreader.png README_kobo.txt \
 			-x "koreader/resources/fonts/*" "koreader/resources/icons/src/*" "koreader/spec/*"
 
+androidupdate:
+	cd $(INSTALL_DIR)/koreader && \
+		7z a -l -mx=5 ../koreader-g$(REVISION).7z *
+
 pot:
 	$(XGETTEXT_BIN) reader.lua `find frontend -iname "*.lua"` \
 		`find plugins -iname "*.lua"` \
diff --git a/koreader-base b/koreader-base
index 06ce7a616..648148e30 160000
--- a/koreader-base
+++ b/koreader-base
@@ -1 +1 @@
-Subproject commit 06ce7a616da2fc66bf476927d7ef9eb08ec4aab8
+Subproject commit 648148e3065a1019438f34c7c9b1b47653c0dab7