diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3858ec9..2e79be1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -86,11 +86,75 @@ jobs:
         name: linux
         path: _output/linux/yarr
 
+  build_linux-arm:
+    name: Build for Linux ARM
+    runs-on: ubuntu-22.04
+    steps:
+    - name: Install dependencies
+      run: >
+        sudo apt-get install -y
+        gcc-arm-linux-gnueabihf
+        libc6-armhf-cross
+    - name: "Checkout"
+      uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
+    - name: "Setup Go"
+      uses: actions/setup-go@v2
+      with:
+        go-version: '^1.17'
+    - name: Cache Go Modules
+      uses: actions/cache@v4
+      with:
+        path: ~/go/pkg/mod
+        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        restore-keys: |
+          ${{ runner.os }}-go-
+    - name: "Build"
+      run: make build_linux_arm
+    - name: Upload
+      uses: actions/upload-artifact@v4
+      with:
+        name: linux_arm
+        path: _output/linux_arm/yarr
+
+  build_linux-arm64:
+    name: Build for Linux ARM64
+    runs-on: ubuntu-22.04
+    steps:
+    - name: Install dependencies
+      run: >
+        sudo apt-get install -y
+        gcc-aarch64-linux-gnu
+        libc6-arm64-cross
+    - name: "Checkout"
+      uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
+    - name: "Setup Go"
+      uses: actions/setup-go@v2
+      with:
+        go-version: '^1.17'
+    - name: Cache Go Modules
+      uses: actions/cache@v4
+      with:
+        path: ~/go/pkg/mod
+        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        restore-keys: |
+          ${{ runner.os }}-go-
+    - name: "Build"
+      run: make build_linux_arm64
+    - name: Upload
+      uses: actions/upload-artifact@v4
+      with:
+        name: linux_arm64
+        path: _output/linux_arm64/yarr
+
   create_release:
     name: Create Release
     runs-on: ubuntu-latest
     if: ${{ !contains(github.ref, 'test') }}
-    needs: [build_macos, build_windows, build_linux]
+    needs: [build_macos, build_windows, build_linux, build_linux-arm, build_linux-arm64]
     steps:
     - name: Download Artifacts
       uses: actions/download-artifact@v4.1.7
@@ -101,10 +165,14 @@ jobs:
         ls -R
         chmod u+x macos/Contents/MacOS/yarr
         chmod u+x linux/yarr
+        chmod u+x linux_arm/yarr
+        chmod u+x linux_arm64/yarr
 
         mv macos yarr.app && zip -r yarr-${GITHUB_REF_NAME}-macos64.zip yarr.app
         ( cd windows        && zip ../yarr-${GITHUB_REF_NAME}-windows64.zip yarr.exe )
         ( cd linux          && zip ../yarr-${GITHUB_REF_NAME}-linux64.zip yarr )
+        ( cd linux_arm      && zip ../yarr-${GITHUB_REF_NAME}-linux_arm.zip yarr )
+        ( cd linux_arm64    && zip ../yarr-${GITHUB_REF_NAME}-linux_arm64.zip yarr )
     - name: Upload Release
       uses: softprops/action-gh-release@v2
       env:
@@ -116,3 +184,5 @@ jobs:
             yarr-${{ github.ref_name }}-macos64.zip
             yarr-${{ github.ref_name }}-windows64.zip
             yarr-${{ github.ref_name }}-linux64.zip
+            yarr-${{ github.ref_name }}-linux_arm.zip
+            yarr-${{ github.ref_name }}-linux_arm64.zip