diff --git a/apps.mk b/apps.mk
new file mode 100644
index 0000000..af42f8b
--- /dev/null
+++ b/apps.mk
@@ -0,0 +1,4 @@
+PRODUCT_COPY_FILES += \
+	vendor/foss/bin/org.schabi.newpipe_41.apk:system/app/org.schabi.newpipe/org.schabi.newpipe.apk
+PRODUCT_COPY_FILES += \
+	vendor/foss/bin/org.smssecure.smssecure_205.apk:system/app/org.smssecure.smssecure/org.smssecure.smssecure.apk
diff --git a/bin/update.sh b/bin/update.sh
deleted file mode 100644
index f0d5115..0000000
--- a/bin/update.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-wget https://f-droid.org/FDroid.apk -O FDroid.apk
-wget https://f-droid.org/repo/com.fsck.k9_23271.apk -O K9Mail.apk
diff --git a/foss.mk b/foss.mk
index c2e7456..b9e7807 100644
--- a/foss.mk
+++ b/foss.mk
@@ -1,6 +1,4 @@
-PRODUCT_COPY_FILES += \
-	vendor/foss/bin/FDroid.apk:system/app/FDroid/FDroid.apk \
-	vendor/foss/bin/K9Mail.apk:system/app/K9Mail/K9Mail.apk
+-include vendor/foss/apps.mk
 
 PRODUCT_PACKAGES += \
 	FDroidPrivilegedExtension
diff --git a/update.sh b/update.sh
new file mode 100644
index 0000000..af98ba8
--- /dev/null
+++ b/update.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+repo="https://f-droid.org/repo/"
+
+addCopy() {
+	echo -e "PRODUCT_COPY_FILES += \\\\\n\tvendor/foss/bin/$1:system/app/$2/${2}.apk" >> apps.mk
+}
+
+rm -Rf bin apps.mk
+mkdir -p bin
+downloadFromFdroid() {
+	mkdir -p tmp
+	if [ ! -f tmp/index.xml ];then
+		#TODO: Check security keys
+		wget $repo/index.jar -O tmp/index.jar
+		unzip -p tmp/index.jar index.xml > tmp/index.xml
+	fi
+	apk="$(xmlstarlet sel -t -m '//application[id="'"$1"'"]/package[1]' -v ./apkname tmp/index.xml)"
+	wget $repo/$apk -O bin/$apk
+	addCopy $apk $1
+}
+
+
+#YouTube viewer
+downloadFromFdroid org.schabi.newpipe
+#Ciphered SMS
+downloadFromFdroid org.smssecure.smssecure
+#Navigation
+downloadFromFdroid net.osmand.plus
+#Web browser
+downloadFromFdroid acr.browser.lightning
+#Calendar
+downloadFromFdroid ws.xsoh.etar
+#Public transportation
+downloadFromFdroid de.grobox.liberario
+#Barcode scanner
+downloadFromFdroid com.google.zxing.client.android
+#Pdf viewer
+downloadFromFdroid com.artifex.mupdfdemo
+#Keyboard/IME
+downloadFromFdroid com.menny.android.anysoftkeyboard
+
+wget https://f-droid.org/FDroid.apk -O bin/FDroid.apk
+addCopy FDroid.apk FDroid
+
+rm -Rf tmp