diff --git a/taskcluster/ci/toolchain/fix-stacks.yml b/taskcluster/ci/toolchain/fix-stacks.yml
index 5a5a20b5699b..4eefc24d8861 100644
--- a/taskcluster/ci/toolchain/fix-stacks.yml
+++ b/taskcluster/ci/toolchain/fix-stacks.yml
@@ -43,6 +43,19 @@ macosx64-fix-stacks:
             - linux64-rust-macos-1.47
             - macosx64-sdk-10.12
 
+macosx64-aarch64-fix-stacks:
+    treeherder:
+        symbol: TM(fix-stacks-arm64)
+    run:
+        arguments: ['aarch64-apple-darwin']
+        toolchain-artifact: public/build/fix-stacks.tar.xz
+    fetches:
+        toolchain:
+            - linux64-cctools-port-clang-11
+            - linux64-clang-11
+            - linux64-rust-macos-1.49
+            - macosx64-sdk-11.0
+
 win32-fix-stacks:
     treeherder:
         symbol: TW32(fix-stacks)
diff --git a/taskcluster/scripts/misc/build-fix-stacks.sh b/taskcluster/scripts/misc/build-fix-stacks.sh
index 8b57a7ac799d..82e43562a75a 100755
--- a/taskcluster/scripts/misc/build-fix-stacks.sh
+++ b/taskcluster/scripts/misc/build-fix-stacks.sh
@@ -18,7 +18,7 @@ x86_64-unknown-linux-gnu)
     export CFLAGS_x86_64_unknown_linux_gnu="--sysroot=$MOZ_FETCHES_DIR/sysroot"
     export RUSTFLAGS="-C linker=$CXX -C link-arg=--sysroot=$MOZ_FETCHES_DIR/sysroot"
     ;;
-x86_64-apple-darwin)
+*-apple-darwin)
     # Cross-compiling for Mac on Linux.
     EXE=
     COMPRESS_EXT=xz
@@ -28,8 +28,11 @@ x86_64-apple-darwin)
     export CXX=$MOZ_FETCHES_DIR/clang/bin/clang++
     export PATH="$MOZ_FETCHES_DIR/cctools/bin:$PATH"
     export RUSTFLAGS="-C linker=$GECKO_PATH/taskcluster/scripts/misc/osx-cross-linker"
-    export TARGET_CC="$CC -isysroot $MOZ_FETCHES_DIR/MacOSX10.12.sdk"
-    export TARGET_CXX="$CXX -isysroot $MOZ_FETCHES_DIR/MacOSX10.12.sdk"
+    if test "$TARGET" = "aarch64-apple-darwin"; then
+        export SDK_VER=11.0
+    fi
+    export TARGET_CC="$CC -isysroot $MOZ_FETCHES_DIR/MacOSX${SDK_VER:-10.12}.sdk"
+    export TARGET_CXX="$CXX -isysroot $MOZ_FETCHES_DIR/MacOSX${SDK_VER:-10.12}.sdk"
     ;;
 i686-pc-windows-msvc)
     # Cross-compiling for Windows on Linux.