diff --git a/.drone.yml b/.drone.yml
index b72174b..c2b760c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -33,7 +33,7 @@ steps:
     EOF
   - apt-get update
   - apt-get install -y --no-install-recommends build-essential qt5-qmake qtbase5-dev qtbase5-dev-tools libexif-dev qt5-image-formats-plugins libmosquitto-dev dpkg-dev fakeroot ca-certificates gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf qtbase5-dev:armhf libqt5core5a:armhf libqt5gui5:armhf libqt5widgets5:armhf libqt5network5:armhf libexif-dev:armhf libmosquitto-dev:armhf qt5-image-formats-plugins:armhf
-  - ARCH=armhf BUILD_DIR=build-armhf QMAKESPEC=linux-arm-gnueabihf-g++ QMAKE_CC=arm-linux-gnueabihf-gcc QMAKE_CXX=arm-linux-gnueabihf-g++ QMAKE_LINK=arm-linux-gnueabihf-g++ QMAKE_CFLAGS="$ARM_CFLAGS" QMAKE_CXXFLAGS="$ARM_CFLAGS" bash sbin/build_deb.sh "${DRONE_TAG:-${DRONE_COMMIT_SHA:0:8}}"
+  - ARCH=armhf BUILD_DIR=build-armhf QMAKESPEC=$PWD/mkspecs/linux-armhf-g++ QMAKE_CFLAGS="$ARM_CFLAGS" QMAKE_CXXFLAGS="$ARM_CFLAGS" bash sbin/build_deb.sh "${DRONE_TAG:-${DRONE_COMMIT_SHA:0:8}}"
   - ls -la dist
 
 - name: build-deb-arm64
@@ -56,7 +56,7 @@ steps:
     EOF
   - apt-get update
   - apt-get install -y --no-install-recommends build-essential qt5-qmake qtbase5-dev qtbase5-dev-tools libexif-dev qt5-image-formats-plugins libmosquitto-dev dpkg-dev fakeroot ca-certificates gcc-aarch64-linux-gnu g++-aarch64-linux-gnu qtbase5-dev:arm64 libqt5core5a:arm64 libqt5gui5:arm64 libqt5widgets5:arm64 libqt5network5:arm64 libexif-dev:arm64 libmosquitto-dev:arm64 qt5-image-formats-plugins:arm64
-  - ARCH=arm64 BUILD_DIR=build-arm64 QMAKESPEC=linux-aarch64-gnu-g++ QMAKE_CC=aarch64-linux-gnu-gcc QMAKE_CXX=aarch64-linux-gnu-g++ QMAKE_LINK=aarch64-linux-gnu-g++ QMAKE_CFLAGS="$ARM64_CFLAGS" QMAKE_CXXFLAGS="$ARM64_CFLAGS" bash sbin/build_deb.sh "${DRONE_TAG:-${DRONE_COMMIT_SHA:0:8}}"
+  - ARCH=arm64 BUILD_DIR=build-arm64 QMAKESPEC=$PWD/mkspecs/linux-arm64-g++ QMAKE_CFLAGS="$ARM64_CFLAGS" QMAKE_CXXFLAGS="$ARM64_CFLAGS" bash sbin/build_deb.sh "${DRONE_TAG:-${DRONE_COMMIT_SHA:0:8}}"
   - ls -la dist
 
 - name: build-deps-image
diff --git a/mkspecs/linux-arm64-g++/qmake.conf b/mkspecs/linux-arm64-g++/qmake.conf
new file mode 100644
index 0000000..ee4a315
--- /dev/null
+++ b/mkspecs/linux-arm64-g++/qmake.conf
@@ -0,0 +1,13 @@
+include($$[QT_INSTALL_DATA]/mkspecs/linux-g++/qmake.conf)
+
+QMAKE_CC = aarch64-linux-gnu-gcc
+QMAKE_CXX = aarch64-linux-gnu-g++
+QMAKE_LINK = aarch64-linux-gnu-g++
+QMAKE_AR = aarch64-linux-gnu-ar cqs
+QMAKE_STRIP = aarch64-linux-gnu-strip
+
+QMAKE_INCDIR_QT = /usr/include/aarch64-linux-gnu/qt5
+QMAKE_LIBDIR_QT = /usr/lib/aarch64-linux-gnu
+QMAKE_INCDIR += /usr/include/aarch64-linux-gnu/qt5
+QMAKE_LIBDIR += /usr/lib/aarch64-linux-gnu
+QMAKE_LFLAGS += -Wl,-rpath-link,/usr/lib/aarch64-linux-gnu
diff --git a/mkspecs/linux-arm64-g++/qplatformdefs.h b/mkspecs/linux-arm64-g++/qplatformdefs.h
new file mode 100644
index 0000000..29699c5
--- /dev/null
+++ b/mkspecs/linux-arm64-g++/qplatformdefs.h
@@ -0,0 +1 @@
+#include "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qplatformdefs.h"
diff --git a/mkspecs/linux-armhf-g++/qmake.conf b/mkspecs/linux-armhf-g++/qmake.conf
new file mode 100644
index 0000000..5def136
--- /dev/null
+++ b/mkspecs/linux-armhf-g++/qmake.conf
@@ -0,0 +1,13 @@
+include($$[QT_INSTALL_DATA]/mkspecs/linux-g++/qmake.conf)
+
+QMAKE_CC = arm-linux-gnueabihf-gcc
+QMAKE_CXX = arm-linux-gnueabihf-g++
+QMAKE_LINK = arm-linux-gnueabihf-g++
+QMAKE_AR = arm-linux-gnueabihf-ar cqs
+QMAKE_STRIP = arm-linux-gnueabihf-strip
+
+QMAKE_INCDIR_QT = /usr/include/arm-linux-gnueabihf/qt5
+QMAKE_LIBDIR_QT = /usr/lib/arm-linux-gnueabihf
+QMAKE_INCDIR += /usr/include/arm-linux-gnueabihf/qt5
+QMAKE_LIBDIR += /usr/lib/arm-linux-gnueabihf
+QMAKE_LFLAGS += -Wl,-rpath-link,/usr/lib/arm-linux-gnueabihf
diff --git a/mkspecs/linux-armhf-g++/qplatformdefs.h b/mkspecs/linux-armhf-g++/qplatformdefs.h
new file mode 100644
index 0000000..29699c5
--- /dev/null
+++ b/mkspecs/linux-armhf-g++/qplatformdefs.h
@@ -0,0 +1 @@
+#include "/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qplatformdefs.h"