diff --git a/frontend/ui/otamanager.lua b/frontend/ui/otamanager.lua
index 514b44b1a..4f01f901e 100644
--- a/frontend/ui/otamanager.lua
+++ b/frontend/ui/otamanager.lua
@@ -1,6 +1,7 @@
 local InfoMessage = require("ui/widget/infomessage")
 local ConfirmBox = require("ui/widget/confirmbox")
 local NetworkMgr = require("ui/networkmgr")
+local lfs = require("libs/libkoreader-lfs")
 local UIManager = require("ui/uimanager")
 local Device = require("ui/device")
 local DEBUG = require("dbg")
@@ -128,6 +129,11 @@ function OTAManager:fetchAndProcessUpdate()
 end
 
 function OTAManager:_buildLocalPackage()
+    -- TODO: validate the installed package?
+    local installed_package = lfs.currentdir() .. "/" .. self.installed_package
+    if lfs.attributes(installed_package, "mode") == "file" then
+        return 0
+    end
     return os.execute(string.format(
         "./tar cvf %s -C .. -T %s --no-recursion",
         self.installed_package, self.package_indexfile))
diff --git a/platform/kindle/koreader.sh b/platform/kindle/koreader.sh
index 7ad2bce0a..e80a1bbf6 100755
--- a/platform/kindle/koreader.sh
+++ b/platform/kindle/koreader.sh
@@ -83,6 +83,7 @@ cd "${KOREADER_DIR}"
 
 # Handle pending OTA update
 NEWUPDATE="${KOREADER_DIR}/ota/koreader.updated.tar"
+INSTALLED="${KOREADER_DIR}/ota/koreader.installed.tar"
 if [ -f "${NEWUPDATE}" ] ; then
 	logmsg "Updating koreader . . ."
 	# Look for our own GNU tar build to do a fancy progress tracking...
@@ -98,7 +99,7 @@ if [ -f "${NEWUPDATE}" ] ; then
 	fi
 	# Cleanup behind us...
 	if [ $? -eq 0 ] ; then
-		rm "${NEWUPDATE}"
+		mv "${NEWUPDATE}" "${INSTALLED}"
 		logmsg "Update sucessful :)"
 		eips_print_bottom_centered "Update successful :)" 1
 	else
diff --git a/platform/kobo/koreader.sh b/platform/kobo/koreader.sh
index bc4c6aa17..b9f49d34f 100755
--- a/platform/kobo/koreader.sh
+++ b/platform/kobo/koreader.sh
@@ -5,10 +5,11 @@ export LC_ALL="en_US.UTF-8"
 KOREADER_DIR=/mnt/onboard/.kobo/koreader
 
 # update to new version from OTA directory
-NEWUPDATE=${KOREADER_DIR}/ota/koreader.updated.tar
+NEWUPDATE="${KOREADER_DIR}/ota/koreader.updated.tar"
+INSTALLED="${KOREADER_DIR}/ota/koreader.installed.tar"
 if [ -f $NEWUPDATE ]; then
     # TODO: any graphic indication for the updating progress?
-    cd /mnt/onboard/.kobo && tar xf $NEWUPDATE && rm $NEWUPDATE
+    cd /mnt/onboard/.kobo && tar xf $NEWUPDATE && mv $NEWUPDATE $INSTALLED
 fi
 
 # we're always starting from our working directory