diff --git a/system-images/android/sdk/build-gstreamer-binaries b/system-images/android/sdk/build-gstreamer-binaries
index b4dd363..8e800d6 100755
--- a/system-images/android/sdk/build-gstreamer-binaries
+++ b/system-images/android/sdk/build-gstreamer-binaries
@@ -1,23 +1,30 @@
 #!/bin/bash
 set -e
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
+case $ANDROID_ARCH in
+arm)
+    ARCH=armv7
+    ;;
+*)
+    ARCH=$ANDROID_ARCH
+esac
+
 wget -c https://gstreamer.freedesktop.org/data/pkg/android/1.16.0/gstreamer-1.0-android-universal-1.16.0.tar.xz
-tar xvf gstreamer-1.0-android-universal-1.16.0.tar.xz
-rm -rf /home/user/armv7/share/gst-android/ndk-build
-rm -rf /home/user/arm64/share/gst-android/ndk-build
-sed -i.bak -e 's|^prefix=.*|prefix=/opt/kdeandroid-deps|g' armv7/lib/pkgconfig/*.pc #fix prefix
-sed -i.bak -e 's|/home/nirbheek/projects/repos/gst/cerbero.git/build/dist/android_universal/armv7|/opt/kdeandroid-deps|g' armv7/lib/pkgconfig/*.pc
-sed -i.bak -e 's|/home/nirbheek/projects/repos/gst/cerbero.git/build/android-ndk-18|/opt/android-ndk|g' armv7/lib/pkgconfig/*.pc
-cp -r armv7/* /opt/kdeandroid-deps/
+tar xvf gstreamer-1.0-android-universal-1.16.0.tar.xz $ARCH
+rm -rf /home/user/*/share/gst-android/ndk-build
+sed -i.bak -e 's|^prefix=.*|prefix=/opt/kdeandroid-deps|g' $ARCH/lib/pkgconfig/*.pc #fix prefix
+sed -i.bak -e 's|/home/nirbheek/projects/repos/gst/cerbero.git/build/dist/android_universal/$ARCH|/opt/kdeandroid-deps|g' $ARCH/lib/pkgconfig/*.pc
+sed -i.bak -e 's|/home/nirbheek/projects/repos/gst/cerbero.git/build/android-ndk-18|/opt/android-ndk|g' $ARCH/lib/pkgconfig/*.pc
+cp -r $ARCH/* /opt/kdeandroid-deps/
 
 git clone --depth 1 git://anongit.freedesktop.org/gstreamer/gst-plugins-good
 cd gst-plugins-good/ext/qt
 
 export PKG_CONFIG_SYSROOT_DIR=/
 export PKG_CONFIG_LIBDIR=/opt/kdeandroid-deps/lib/pkgconfig/
 
 qmake
 make
 install libgstqmlgl.a /opt/kdeandroid-deps/lib/gstreamer-1.0