diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 121494a..439d77f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,7 +12,8 @@ jobs:
         arch:
           - x86_64
           - i686
-          - armhf
+          - armv7-a
+          - armv8-a
     env:
       ARCH: ${{ matrix.arch }}
     steps:
@@ -24,7 +25,7 @@ jobs:
         if: matrix.arch == 'i686'
       - name: Install armhf cross-compile dependencies
         run: sudo apt-get install gcc-multilib-arm-linux-gnueabihf
-        if: matrix.arch == 'armhf'
+        if: startsWith(matrix.arch, 'arm')
       - name: Build
         run: |
           mkdir artifacts
@@ -95,26 +96,37 @@ jobs:
         with:
           name: ffmpeg-linux-x86_64
           path: artifacts/
+
       - uses: actions/download-artifact@v1
         with:
           name: ffmpeg-linux-i686
           path: artifacts/
+
+      - uses: actions/download-artifact@v1
+        with:
+          name: ffmpeg-linux-armv7-a
+          path: artifacts/
+
       - uses: actions/download-artifact@v1
         with:
-          name: ffmpeg-linux-armhf
+          name: ffmpeg-linux-armv8-a
           path: artifacts/
+
       - uses: actions/download-artifact@v1
         with:
           name: ffmpeg-windows-x86_64
           path: artifacts/
+
       - uses: actions/download-artifact@v1
         with:
           name: ffmpeg-windows-i686
           path: artifacts/
+
       - uses: actions/download-artifact@v1
         with:
           name: ffmpeg-macos-x86_64
           path: artifacts/
+
       - name: Make tarballs
         run: |
           mkdir artifacts/release/
diff --git a/README.md b/README.md
index b84a76f..1d62cc9 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@ Supported platforms:
       * Intel i686
       * Intel x86\_64
       * ARMv7-A (e.g. Raspberry Pi 2)
+      * ARMv8-A (e.g. Raspberry Pi 3)
   - Windows
       * Intel i686
       * Intel x86\_64
diff --git a/build-linux.sh b/build-linux.sh
index 1ae3381..0e94ce6 100755
--- a/build-linux.sh
+++ b/build-linux.sh
@@ -20,7 +20,7 @@ case $ARCH in
 i686)
     FFMPEG_CONFIGURE_FLAGS+=(--cc="gcc -m32")
     ;;
-armhf*)
+arm*)
     FFMPEG_CONFIGURE_FLAGS+=(
         --enable-cross-compile
         --cross-prefix=arm-linux-gnueabihf-
@@ -28,6 +28,16 @@ armhf*)
         --arch=arm
     )
     case $ARCH in
+    armv7-a)
+        FFMPEG_CONFIGURE_FLAGS+=(
+            --cpu=armv7-a
+        )
+        ;;
+    armv8-a)
+        FFMPEG_CONFIGURE_FLAGS+=(
+            --cpu=armv8-a
+        )
+        ;;
     armhf-rpi2)
         FFMPEG_CONFIGURE_FLAGS+=(
             --cpu=cortex-a7