diff --git a/Makefile b/Makefile
index e697577e7..1af9ad9ca 100644
--- a/Makefile
+++ b/Makefile
@@ -12,8 +12,7 @@ VERSION=$(shell git describe HEAD)
 INSTALL_DIR=koreader-$(MACHINE)
 
 # files to link from main directory
-INSTALL_FILES=reader.lua frontend resources koreader.sh \
-		koreader_kobo.sh kobo_suspend.sh defaults.lua \
+INSTALL_FILES=reader.lua frontend resources defaults.lua \
 		git-rev README.md COPYING
 
 # for gettext
@@ -46,15 +45,6 @@ endif
 	mkdir -p $(INSTALL_DIR)/koreader/data/dict
 	mkdir -p $(INSTALL_DIR)/koreader/data/tessdata
 	mkdir -p $(INSTALL_DIR)/koreader/fonts/host
-	# Kindle startup
-	ln -sf ../extensions $(INSTALL_DIR)/
-	ln -sf ../launchpad $(INSTALL_DIR)/
-	# Kobo startup
-	mkdir -p $(INSTALL_DIR)/kobo/mnt/onboard/.kobo
-	ln -sf ../../../../../fmon $(INSTALL_DIR)/kobo/mnt/onboard/.kobo/
-	cd $(INSTALL_DIR)/kobo && tar -czhf ../KoboRoot.tgz mnt
-	cp resources/koreader.png $(INSTALL_DIR)/koreader.png
-	cp fmon/README.txt $(INSTALL_DIR)/README_kobo.txt
 ifndef EMULATE_READER
 	# clean up, remove unused files for releases
 	rm -rf $(INSTALL_DIR)/koreader/data/{cr3.ini,cr3skin-format.txt,desktop,devices,manual}
@@ -78,11 +68,15 @@ clean:
 	rm -rf $(INSTALL_DIR)
 	$(MAKE) -C $(KOR_BASE) clean
 
-customupdate: all
+kindleupdate: all
 	# ensure that the binaries were built for ARM
 	file $(INSTALL_DIR)/koreader/luajit | grep ARM || exit 1
 	# remove old package if any
 	rm -f koreader-kindle-$(MACHINE)-$(VERSION).zip
+	# Kindle launching scripts
+	ln -sf ../kindle/extensions $(INSTALL_DIR)/
+	ln -sf ../kindle/launchpad $(INSTALL_DIR)/
+	ln -sf ../../kindle/koreader.sh $(INSTALL_DIR)/koreader
 	# create new package
 	cd $(INSTALL_DIR) && \
 		zip -9 -r \
@@ -96,12 +90,21 @@ koboupdate: all
 	file $(INSTALL_DIR)/koreader/luajit | grep ARM || exit 1
 	# remove old package if any
 	rm -f koreader-kobo-$(MACHINE)-$(VERSION).zip
+	# Kobo launching scripts
+	mkdir -p $(INSTALL_DIR)/kobo/mnt/onboard/.kobo
+	ln -sf ../../../../../kobo/fmon $(INSTALL_DIR)/kobo/mnt/onboard/.kobo/
+	cd $(INSTALL_DIR)/kobo && tar -czhf ../KoboRoot.tgz mnt
+	cp resources/koreader.png $(INSTALL_DIR)/koreader.png
+	cp kobo/fmon/README.txt $(INSTALL_DIR)/README_kobo.txt
+	cp kobo/koreader_kobo.sh $(INSTALL_DIR)/koreader
+	cp kobo/kobo_suspend.sh $(INSTALL_DIR)/koreader
+	cp kobo/*.bin $(INSTALL_DIR)/koreader
 	# create new package
 	cd $(INSTALL_DIR) && \
 		zip -9 -r \
 			../koreader-kobo-$(MACHINE)-$(VERSION).zip \
 			KoboRoot.tgz koreader koreader.png README_kobo.txt \
-			-x "koreader/resources/fonts/*" "koreader/resources/icons/src/*" "koreader/spec/*" "koreader/Kobo/*"
+			-x "koreader/resources/fonts/*" "koreader/resources/icons/src/*" "koreader/spec/*"
 
 pot:
 	$(XGETTEXT_BIN) reader.lua `find frontend -iname "*.lua"` \
diff --git a/README.md b/README.md
index bae2d1835..8b8d0b2d3 100644
--- a/README.md
+++ b/README.md
@@ -70,7 +70,7 @@ make clean
 
 To build for the Kindle:
 ```
-make customupdate
+make kindleupdate
 ```
 
 To build for the Kobo:
diff --git a/extensions/koreader/README.txt b/kindle/extensions/koreader/README.txt
similarity index 100%
rename from extensions/koreader/README.txt
rename to kindle/extensions/koreader/README.txt
diff --git a/extensions/koreader/config.xml b/kindle/extensions/koreader/config.xml
similarity index 100%
rename from extensions/koreader/config.xml
rename to kindle/extensions/koreader/config.xml
diff --git a/extensions/koreader/menu.json b/kindle/extensions/koreader/menu.json
similarity index 100%
rename from extensions/koreader/menu.json
rename to kindle/extensions/koreader/menu.json
diff --git a/koreader.sh b/kindle/koreader.sh
similarity index 100%
rename from koreader.sh
rename to kindle/koreader.sh
diff --git a/launchpad/koreader.ini b/kindle/launchpad/koreader.ini
similarity index 100%
rename from launchpad/koreader.ini
rename to kindle/launchpad/koreader.ini
diff --git a/Kobo/KoboAuraTapHomeIcon.bin b/kobo/KoboAuraTapHomeIcon.bin
similarity index 100%
rename from Kobo/KoboAuraTapHomeIcon.bin
rename to kobo/KoboAuraTapHomeIcon.bin
diff --git a/Kobo/KoboMiniTapHomeIcon.bin b/kobo/KoboMiniTapHomeIcon.bin
similarity index 100%
rename from Kobo/KoboMiniTapHomeIcon.bin
rename to kobo/KoboMiniTapHomeIcon.bin
diff --git a/Kobo/KoboTouchHomeButton.bin b/kobo/KoboTouchHomeButton.bin
similarity index 100%
rename from Kobo/KoboTouchHomeButton.bin
rename to kobo/KoboTouchHomeButton.bin
diff --git a/fmon/README.txt b/kobo/fmon/README.txt
similarity index 100%
rename from fmon/README.txt
rename to kobo/fmon/README.txt
diff --git a/fmon/koreader.sh b/kobo/fmon/koreader.sh
similarity index 100%
rename from fmon/koreader.sh
rename to kobo/fmon/koreader.sh
diff --git a/kobo_suspend.sh b/kobo/kobo_suspend.sh
similarity index 100%
rename from kobo_suspend.sh
rename to kobo/kobo_suspend.sh
diff --git a/koreader_kobo.sh b/kobo/koreader_kobo.sh
similarity index 89%
rename from koreader_kobo.sh
rename to kobo/koreader_kobo.sh
index 84171f03f..8a49927ae 100644
--- a/koreader_kobo.sh
+++ b/kobo/koreader_kobo.sh
@@ -23,23 +23,23 @@ killall -STOP nickel
 killall -CONT nickel
 
 # return to home screen
-cd /mnt/onboard/.kobo/koreader/Kobo
 case `/bin/kobo_config.sh * 2>/dev/null` in
-	dragon)		#DEVICE=AURAHD 
+	dragon)		#DEVICE=AURAHD
 				#no binary file available
 		;;
 	phoenix)	#DEVICE=AURA
 				cat ./KoboAuraTapHomeIcon.bin > /dev/input/event1
 				cat ./KoboAuraTapHomeIcon.bin > /dev/input/event1
 		;;
-	kraken)		#DEVICE=GLO    
+	kraken)		#DEVICE=GLO
 				#no binary file available
 		;;
-	pixie)		#DEVICE=MINI   
+	pixie)		#DEVICE=MINI
 				cat ./KoboMiniTapHomeIcon.bin > /dev/input/event1
 				cat ./KoboMiniTapHomeIcon.bin > /dev/input/event1
 		;;
 	trilogy|*)	#DEVICE=TOUCH
 				cat ./KoboTouchHomeButton.bin > /dev/input/event0
 		;;
-esac
\ No newline at end of file
+esac
+
diff --git a/koreader-base b/koreader-base
index 5521a8786..ac9eea0e0 160000
--- a/koreader-base
+++ b/koreader-base
@@ -1 +1 @@
-Subproject commit 5521a8786a1e148625c4ca31d3626be5b92814cb
+Subproject commit ac9eea0e045cc6e0a6021850fe804ae1c09748a3