diff --git a/F-Droid/ant-prepare.sh b/F-Droid/ant-prepare.sh
index e171f25b3..b12f16bff 100755
--- a/F-Droid/ant-prepare.sh
+++ b/F-Droid/ant-prepare.sh
@@ -41,7 +41,7 @@ android update lib-project --path $EXTERN/zxing-core
 android update lib-project --path $EXTERN/android-support-v4-preferencefragment
 place_support_v4 $EXTERN/android-support-v4-preferencefragment
 
-android update lib-project --path $EXTERN/Support/v7/appcompat --target android-21
+android update lib-project --path $EXTERN/Support/v7/appcompat --target android-19
 place_support_v4 $EXTERN/Support/v7/appcompat
 
 android update project --path . --name F-Droid
diff --git a/F-Droid/build.gradle b/F-Droid/build.gradle
index c1d912b79..606e164df 100644
--- a/F-Droid/build.gradle
+++ b/F-Droid/build.gradle
@@ -92,7 +92,7 @@ task cleanBinaryDeps(type: Delete) {
     enabled = project.hasProperty('sourceDeps')
     description = "Removes all .jar and .aar files from F-Droid/libs/. Requires the sourceDeps property to be set (\"gradle -PsourceDeps cleanBinaryDeps\")"
 
-    delete fileTree('libs') {
+    delete fileTree('libs/binaryDeps') {
         include '*.aar'
         include '*.jar'
     }
@@ -113,13 +113,13 @@ task binaryDeps(type: Copy, dependsOn: ':F-Droid:prepareReleaseDependencies') {
                 // 'MemorizingTrustManager/build/outputs/aar/MemorizingTrustManager-release.aar'
     }
 
-    into 'libs'
+    into 'libs/binaryDeps'
 
     includeEmptyDirs false
 
     eachFile { FileCopyDetails details ->
-        // Don't copy to a sub folder such as libs/Project/build/outputs/aar/project.aar, but
-        // rather libs/project.aar.
+        // Don't copy to a sub folder such as libs/binaryDeps/Project/build/outputs/aar/project.aar, but
+        // rather libs/binaryDeps/project.aar.
         details.path = details.name
     }
 
diff --git a/F-Droid/libs/binaryDeps/android-support-v4-preferencefragment-release.aar b/F-Droid/libs/binaryDeps/android-support-v4-preferencefragment-release.aar
index 1515258cc..2bb041037 100644
Binary files a/F-Droid/libs/binaryDeps/android-support-v4-preferencefragment-release.aar and b/F-Droid/libs/binaryDeps/android-support-v4-preferencefragment-release.aar differ
diff --git a/F-Droid/libs/binaryDeps/nanohttpd-2.1.0.jar b/F-Droid/libs/binaryDeps/nanohttpd-2.1.0.jar
index 21e46717c..d19ba71b3 100644
Binary files a/F-Droid/libs/binaryDeps/nanohttpd-2.1.0.jar and b/F-Droid/libs/binaryDeps/nanohttpd-2.1.0.jar differ
diff --git a/F-Droid/libs/binaryDeps/zipsigner.jar b/F-Droid/libs/binaryDeps/zipsigner.jar
index dc2ab6802..1e741d758 100644
Binary files a/F-Droid/libs/binaryDeps/zipsigner.jar and b/F-Droid/libs/binaryDeps/zipsigner.jar differ