diff --git a/Makefile b/Makefile
index 1bade55c9..3a53a4f97 100644
--- a/Makefile
+++ b/Makefile
@@ -64,17 +64,14 @@ all: base
 ifdef ANDROID
 	rm -f android-fdroid-version; echo -e "$(ANDROID_NAME)\n$(ANDROID_VERSION)" > koreader-android-fdroid-latest
 endif
-ifeq ($(IS_RELEASE),1)
-	bash -O extglob -c '$(RCP) -fL $(OUTPUT_DIR_ARTIFACTS) $(INSTALL_DIR)/koreader/'
-else
-	cp -f $(KOR_BASE)/ev_replay.py $(INSTALL_DIR)/koreader/
-	@echo "[*] create symlink instead of copying files in development mode"
+ifeq (,$(IS_RELEASE))
+	$(SYMLINK) $(KOR_BASE)/ev_replay.py $(INSTALL_DIR)/koreader/
+endif
 	bash -O extglob -c '$(SYMLINK) $(OUTPUT_DIR_ARTIFACTS) $(INSTALL_DIR)/koreader/'
-  ifneq (,$(EMULATE_READER))
+ifneq (,$(EMULATE_READER))
 	@echo "[*] install front spec only for the emulator"
 	$(SYMLINK) spec $(INSTALL_DIR)/koreader/spec/front
 	$(SYMLINK) test $(INSTALL_DIR)/koreader/spec/front/unit/data
-  endif
 endif
 	$(SYMLINK) $(INSTALL_FILES) $(INSTALL_DIR)/koreader/
 ifdef ANDROID
@@ -96,10 +93,10 @@ endif
 	$(SYMLINK) plugins $(INSTALL_DIR)/koreader/
 	@echo "[*] Install resources"
 	$(SYMLINK) resources/fonts/* $(INSTALL_DIR)/koreader/fonts/
-	install -d $(INSTALL_DIR)/koreader/{screenshots,data/{dict,tessdata},fonts/host,ota}
-ifeq ($(IS_RELEASE),1)
+	install -d $(INSTALL_DIR)/koreader/{screenshots,fonts/host,ota}
+ifneq (,$(IS_RELEASE))
 	@echo "[*] Clean up, remove unused files for releases"
-	rm -rf $(INSTALL_DIR)/koreader/data/{cr3.ini,cr3skin-format.txt,desktop,devices,manual}
+	rm -rf $(INSTALL_DIR)/koreader/data/{cr3.ini,desktop,devices,dict,manual,tessdata}
 endif
 
 base:
diff --git a/base b/base
index aade35b80..0d6abcf61 160000
--- a/base
+++ b/base
@@ -1 +1 @@
-Subproject commit aade35b80ffe07619a462d9bbf7f899a3962ee09
+Subproject commit 0d6abcf6113f6d9c0ebd1de2db3bad085f37ed89
diff --git a/make/android.mk b/make/android.mk
index a23c9defe..5f6f008be 100644
--- a/make/android.mk
+++ b/make/android.mk
@@ -29,7 +29,7 @@ update: all
 	# APK version
 	echo $(VERSION) > $(ANDROID_ASSETS)/version.txt
 	# shared libraries are stored as raw assets
-	cp -pR $(INSTALL_DIR)/koreader/libs $(ANDROID_LAUNCHER_DIR)/assets
+	cp -pLR $(INSTALL_DIR)/koreader/libs $(ANDROID_LAUNCHER_DIR)/assets
 	# in runtime luajit-launcher's libluajit.so will be loaded
 	rm -vf $(ANDROID_LAUNCHER_DIR)/assets/libs/libluajit.so
 	# binaries are stored as shared libraries to prevent W^X exception on Android 10+
diff --git a/make/cervantes.mk b/make/cervantes.mk
index f03f74acf..cf8b1350a 100644
--- a/make/cervantes.mk
+++ b/make/cervantes.mk
@@ -4,7 +4,7 @@ CERVANTES_PACKAGE_OTA = koreader-cervantes$(KODEDUG_SUFFIX)-$(VERSION).targz
 
 update: all
 	# ensure that the binaries were built for ARM
-	file $(INSTALL_DIR)/koreader/luajit | grep ARM || exit 1
+	file --dereference $(INSTALL_DIR)/koreader/luajit | grep ARM || exit 1
 	# remove old package if any
 	rm -f $(CERVANTES_PACKAGE)
 	# Cervantes launching scripts
diff --git a/make/kindle.mk b/make/kindle.mk
index 72c189ab4..605390d90 100644
--- a/make/kindle.mk
+++ b/make/kindle.mk
@@ -10,7 +10,7 @@ endif
 
 update: all
 	# ensure that the binaries were built for ARM
-	file $(INSTALL_DIR)/koreader/luajit | grep ARM || exit 1
+	file --dereference $(INSTALL_DIR)/koreader/luajit | grep ARM || exit 1
 	# remove old package if any
 	rm -f $(KINDLE_PACKAGE)
 	# Kindle launching scripts
diff --git a/make/kobo.mk b/make/kobo.mk
index d240fc1f3..70fde90d7 100644
--- a/make/kobo.mk
+++ b/make/kobo.mk
@@ -4,7 +4,7 @@ KOBO_PACKAGE_OTA = koreader-kobo$(KODEDUG_SUFFIX)-$(VERSION).targz
 
 update: all
 	# ensure that the binaries were built for ARM
-	file $(INSTALL_DIR)/koreader/luajit | grep ARM || exit 1
+	file --dereference $(INSTALL_DIR)/koreader/luajit | grep ARM || exit 1
 	# remove old package if any
 	rm -f $(KOBO_PACKAGE)
 	# Kobo launching scripts
diff --git a/make/pocketbook.mk b/make/pocketbook.mk
index 474b3fa53..369d03260 100644
--- a/make/pocketbook.mk
+++ b/make/pocketbook.mk
@@ -4,7 +4,7 @@ PB_PACKAGE_OTA = koreader-pocketbook$(KODEDUG_SUFFIX)-$(VERSION).targz
 
 update: all
 	# ensure that the binaries were built for ARM
-	file $(INSTALL_DIR)/koreader/luajit | grep ARM || exit 1
+	file --dereference $(INSTALL_DIR)/koreader/luajit | grep ARM || exit 1
 	# remove old package if any
 	rm -f $(PB_PACKAGE)
 	# Pocketbook launching scripts
diff --git a/make/remarkable.mk b/make/remarkable.mk
index 024e59278..31ee8bd1b 100644
--- a/make/remarkable.mk
+++ b/make/remarkable.mk
@@ -4,7 +4,7 @@ REMARKABLE_PACKAGE_OTA = koreader-remarkable$(KODEDUG_SUFFIX)-$(VERSION).targz
 
 update: all
 	# ensure that the binaries were built for ARM
-	file $(INSTALL_DIR)/koreader/luajit | grep ARM || exit 1
+	file --dereference $(INSTALL_DIR)/koreader/luajit | grep ARM || exit 1
 	# remove old package if any
 	rm -f $(REMARKABLE_PACKAGE)
 	# Remarkable scripts
diff --git a/make/sony-prstux.mk b/make/sony-prstux.mk
index 38d6d90ec..63154548a 100644
--- a/make/sony-prstux.mk
+++ b/make/sony-prstux.mk
@@ -4,7 +4,7 @@ SONY_PRSTUX_PACKAGE_OTA = koreader-sony-prstux$(KODEDUG_SUFFIX)-$(VERSION).targz
 
 update: all
 	# ensure that the binaries were built for ARM
-	file $(INSTALL_DIR)/koreader/luajit | grep ARM || exit 1
+	file --dereference $(INSTALL_DIR)/koreader/luajit | grep ARM || exit 1
 	# remove old package if any
 	rm -f $(SONY_PRSTUX_PACKAGE)
 	# Sony PRSTUX launching scripts
diff --git a/make/ubuntu-touch.mk b/make/ubuntu-touch.mk
index 90b023d7c..22113ed92 100644
--- a/make/ubuntu-touch.mk
+++ b/make/ubuntu-touch.mk
@@ -3,7 +3,7 @@ UBUNTUTOUCH_SDL_DIR = $(UBUNTUTOUCH_DIR)/ubuntu-touch-sdl
 
 update: all
 	# ensure that the binaries were built for ARM
-	file $(INSTALL_DIR)/koreader/luajit | grep ARM || exit 1
+	file --dereference $(INSTALL_DIR)/koreader/luajit | grep ARM || exit 1
 	# remove old package if any
 	rm -f koreader-ubuntu-touch-$(MACHINE)-$(VERSION).click
 	$(SYMLINK) $(UBUNTUTOUCH_DIR)/koreader.sh $(INSTALL_DIR)/koreader/