diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 38be5c60..24c37747 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -85,6 +85,10 @@ jobs:
       if:   ${{ matrix.target == 'aarch64-unknown-linux-musl' }}
       run:  sudo apt-get install gcc-aarch64-linux-gnu libc6-dev-i386
 
+    - name: Install AArch64 Toolchain (Windows)
+      if:   ${{ matrix.target == 'aarch64-pc-windows-msvc' }}
+      run:  rustup target add aarch64-pc-windows-msvc
+
     - name: Install ARM Toolchain
       if:   >-
         ${{
@@ -94,9 +98,9 @@ jobs:
       run: |
         sudo apt-get install gcc-arm-linux-gnueabihf
 
-    - name: Install AArch64 Toolchain (Windows)
-      if:   ${{ matrix.target == 'aarch64-pc-windows-msvc' }}
-      run:  rustup target add aarch64-pc-windows-msvc
+    - name: Install musl Toolchain
+      if:   ${{ matrix.target == 'x86_64-unknown-linux-musl' }}
+      run:  sudo apt-get install musl-tools
 
     - name: Package
       id: package
diff --git a/bin/package b/bin/package
index 7131cb67..5d3d3da6 100755
--- a/bin/package
+++ b/bin/package
@@ -13,9 +13,14 @@ echo "Installing rust toolchain for $TARGET..."
 rustup target add $TARGET
 
 echo "Building filepack..."
-if [[ $TARGET == aarch64-unknown-linux-musl ]]; then
-  export CC=aarch64-linux-gnu-gcc
-fi
+case $TARGET in
+  aarch64-unknown-linux-musl)
+    export CC=aarch64-linux-gnu-gcc
+    ;;
+  arm-unknown-linux-musleabihf | armv7-unknown-linux-musleabihf)
+    export CC=arm-linux-gnueabihf-gcc
+    ;;
+esac
 RUSTFLAGS="--deny warnings --codegen target-feature=+crt-static $TARGET_RUSTFLAGS" \
   cargo build --bin filepack --target $TARGET --release
 export -n CC