diff --git a/F-Droid/tools/zip-build.sh b/F-Droid/tools/zip-build.sh
index 425ccafaf..2fe6a1082 100755
--- a/F-Droid/tools/zip-build.sh
+++ b/F-Droid/tools/zip-build.sh
@@ -14,24 +14,27 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-function create-update-zip {
-    APK_NAME=$1
-    rm -rf "bin/zip/${APK_NAME}"*
-    mkdir -p bin/zip/${APK_NAME}
-    cp bin/${APK_NAME}.apk bin/zip/${APK_NAME}/FDroid.apk
-    mkdir -p bin/zip/${APK_NAME}/META-INF/com/google/android
-    cp tools/zip-installer bin/zip/${APK_NAME}/META-INF/com/google/android/update-binary
-    (cd bin/zip/${APK_NAME}; zip -r -X ../${APK_NAME}.zip FDroid.apk META-INF/com/google/android/update-binary)
-}
+# find the real path to the base of fdroidclient
+project_dir=$(cd `echo $0 | sed 's|\(.*\)/.*$|\1|'`/.. && pwd)
+cd "$project_dir"
+
+rm -rf "${project_dir}/bin/zip/"
 
 for apk in bin/*.apk
 do
     apk=${apk##*/}
     apk=${apk%%\.apk}
-    create-update-zip $apk
+    rm -f bin/${apk}.zip
+    mkdir -p bin/zip/${apk}
+    cp bin/${apk}.apk bin/zip/${apk}/FDroid.apk
+    mkdir -p bin/zip/${apk}/META-INF/com/google/android
+    cp tools/zip-installer bin/zip/${apk}/META-INF/com/google/android/update-binary
+    (cd "${project_dir}/bin/zip/${apk}" && \
+        zip -r -X ../../${apk}.zip FDroid.apk META-INF/com/google/android/update-binary)
 done
 
-rm -rf bin/zip/F-Droid-remove*
+rm -rf "bin/zip/F-Droid-remove*"
 mkdir -p bin/zip/F-Droid-remove/META-INF/com/google/android
 cp tools/zip-uninstaller bin/zip/F-Droid-remove/META-INF/com/google/android/update-binary
-(cd bin/zip/F-Droid-remove; zip -r -X ../F-Droid-remove.zip FDroid.apk META-INF/com/google/android/update-binary)
+(cd "${project_dir}/bin/zip/F-Droid-remove" && \
+    zip -r -X ../../F-Droid-remove.zip FDroid.apk META-INF/com/google/android/update-binary)