diff --git a/changeAppSettings.sh b/changeAppSettings.sh
index 2ce10f7bd..44f868616 100755
--- a/changeAppSettings.sh
+++ b/changeAppSettings.sh
@@ -1105,7 +1105,7 @@ fi
 
 echo Compiling prebuilt libraries
 
-if echo "$CompiledLibraries" | grep -E 'iconv|charset|icu|crypto|ssl' > /dev/null; then
+if echo "$CompiledLibraries" | grep -E 'iconv|charset|icu|crypto|ssl|harfbuzz' > /dev/null; then
 	make -C project/jni -f Makefile.prebuilt
 fi
 if echo "$CompiledLibraries" | grep 'boost' > /dev/null; then
diff --git a/createSourceArchive.sh b/createSourceArchive.sh
index a7582494a..87d7c75e1 100755
--- a/createSourceArchive.sh
+++ b/createSourceArchive.sh
@@ -11,6 +11,8 @@ which pxz > /dev/null && ARCHIVER=pxz && EXT=xz || echo "Install pxz for faster
 # TODO: Boost, Python and ffmpeg are stored in repository as precompiled binaries, the proper way to fix that is to build them using scripts, and remove that binaries
 # --exclude="*.a" --exclude="*.so"
 tar -c --exclude-vcs --exclude="*.o" --exclude="*.d" --exclude="*.dep" \
+--exclude="libboost_*.a" --exclude="libcharset.so" --exclude="libiconv.so" \
+--exclude="libicu*.a" --exclude="libharfbuzz.a" --exclude="libcrypto.so*" --exclude="libssl.so*" \
 `git ls-files --exclude-standard | grep -v '^project/jni/application/.*'` \
 `find  project/jni/application -maxdepth 1 -type f -o -type l` \
 project/jni/application/src \