diff --git a/contrib/build.Dockerfile b/contrib/build.Dockerfile
index 622926491..7c3de8cf1 100644
--- a/contrib/build.Dockerfile
+++ b/contrib/build.Dockerfile
@@ -41,17 +41,19 @@ ENV BUILD_DATE="Jan  1 2019"
 ENV BUILD_TIME="00:00:00"
 RUN eval "$(pyenv init --path)" && eval "$(pyenv virtualenv-init -)" && cat /opt/reproducible-python.diff | pyenv install -kp 3.9.7
 
-RUN dpkg --add-architecture i386
-RUN wget -nc https://dl.winehq.org/wine-builds/winehq.key
-RUN apt-key add winehq.key
-RUN echo "deb https://dl.winehq.org/wine-builds/debian/ stretch main" >> /etc/apt/sources.list
-RUN apt-get update
-RUN apt-get install --install-recommends -y \
-    wine-stable-amd64 \
-    wine-stable-i386 \
-    wine-stable \
-    winehq-stable \
-    p7zip-full
+RUN if [[ $(dpkg --print-architecture) == "amd64" ]]; then \
+        dpkg --add-architecture i386; \ 
+        wget -nc https://dl.winehq.org/wine-builds/winehq.key; \
+        apt-key add winehq.key; \
+        echo "deb https://dl.winehq.org/wine-builds/debian/ stretch main" >> /etc/apt/sources.list; \
+        apt-get update; \
+        apt-get install --install-recommends -y \
+            wine-stable-amd64 \
+            wine-stable-i386 \
+            wine-stable \
+            winehq-stable \
+            p7zip-full; \
+    fi
 
 ENV LC_ALL=C.UTF-8
 ENV LANG=C.UTF-8
diff --git a/contrib/build_bin.sh b/contrib/build_bin.sh
index 42264c1b7..a8d36b667 100755
--- a/contrib/build_bin.sh
+++ b/contrib/build_bin.sh
@@ -4,6 +4,8 @@
 
 set -ex
 
+arch=`dpkg --print-architecture`
+
 eval "$(pyenv init --path)"
 eval "$(pyenv virtualenv-init -)"
 pip install -U pip
@@ -40,7 +42,7 @@ OS=`uname | tr '[:upper:]' '[:lower:]'`
 if [[ $OS == "darwin" ]]; then
     OS="mac"
 fi
-target_tarfile="hwi-${VERSION}-${OS}-amd64.tar.gz"
+target_tarfile="hwi-${VERSION}-${OS}-${arch}.tar.gz"
 
 if [[ $gui_support == "--with-gui" ]]; then
     tar -czf $target_tarfile hwi hwi-qt
diff --git a/hwi.spec b/hwi.spec
index 1502458f8..6ad8d380c 100644
--- a/hwi.spec
+++ b/hwi.spec
@@ -13,7 +13,7 @@ def get_libusb_path():
         prefix = proc.communicate()[0].rstrip().decode()
         return os.path.join(prefix, "lib", "libusb-1.0.dylib")
     if platform.system() == "Linux":
-        for lib_dir in ["/lib/x86_64-linux-gnu", "/usr/lib64", "/lib64" "/usr/lib", "/lib"]:
+        for lib_dir in ["/lib/x86_64-linux-gnu", "/lib/aarch64-linux-gnu", "/usr/lib64", "/lib64" "/usr/lib", "/lib"]:
             libusb_path = os.path.join(lib_dir, "libusb-1.0.so.0")
             if os.path.exists(libusb_path):
                 return libusb_path