diff --git a/.github/workflows/pypi_upload.yml b/.github/workflows/pypi_upload.yml
index 3be9b5c16dc..3d81c9d31f0 100644
--- a/.github/workflows/pypi_upload.yml
+++ b/.github/workflows/pypi_upload.yml
@@ -62,7 +62,9 @@ jobs:
             && cibuildwheel --print-build-identifiers --platform macos \
             | pyp 'json.dumps({"only": x, "os": "macos-latest"})' \
             && cibuildwheel --print-build-identifiers --platform windows \
-            | pyp 'json.dumps({"only": x, "os": "windows-latest"})'
+            | pyp 'json.dumps({"only": x, "os": "windows-latest"})' \
+            && cibuildwheel --print-build-identifiers --platform windows --archs ARM64 \
+            | pyp 'json.dumps({"only": x, "os": "windows-11-arm"})'
           } | pyp 'json.dumps(list(map(json.loads, lines)))' > /tmp/matrix
         env:
           CIBW_ARCHS_LINUX: x86_64
diff --git a/.github/workflows/release_tests.yml b/.github/workflows/release_tests.yml
index 078c7e8f0f7..a6e125e3d99 100644
--- a/.github/workflows/release_tests.yml
+++ b/.github/workflows/release_tests.yml
@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.13"]
-        os: [macOS-latest, ubuntu-latest, windows-latest]
+        os: [macOS-latest, ubuntu-latest, windows-latest, windows-11-arm]
 
     steps:
       - uses: actions/checkout@v5
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2dd1899fb61..7bc5ec2f671 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -31,8 +31,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12.4", "3.13", "3.14", "pypy-3.9"]
-        os: [ubuntu-latest, macOS-latest, windows-latest]
+        python-version: ["3.9", "3.10", "3.11", "3.12.10", "3.13", "3.14", "pypy-3.9"]
+        os: [ubuntu-latest, macOS-latest, windows-latest, windows-11-arm]
+        exclude:
+          # setup-python only supports 3.11+ on arm64 windows
+          - os: windows-11-arm
+            python-version: "3.9"
+          - os: windows-11-arm
+            python-version: "3.10"
+          - os: windows-11-arm
+            python-version: "pypy-3.9"
 
     steps:
       - uses: actions/checkout@v5
diff --git a/.github/workflows/upload_binary.yml b/.github/workflows/upload_binary.yml
index df0a8907bc5..c49f84c7544 100644
--- a/.github/workflows/upload_binary.yml
+++ b/.github/workflows/upload_binary.yml
@@ -13,12 +13,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2025, ubuntu-22.04, ubuntu-22.04-arm, macos-latest]
+        os: [windows-2025, windows-11-arm, ubuntu-22.04, ubuntu-22.04-arm, macos-latest]
         include:
           - os: windows-2025
             pathsep: ";"
             asset_name: black_windows.exe
             executable_mime: "application/vnd.microsoft.portable-executable"
+          - os: windows-11-arm
+            pathsep: ";"
+            asset_name: black_windows-arm.exe
+            executable_mime: "application/vnd.microsoft.portable-executable"
           - os: ubuntu-22.04
             pathsep: ":"
             asset_name: black_linux
@@ -38,7 +42,7 @@ jobs:
       - name: Set up latest Python
         uses: actions/setup-python@v6
         with:
-          python-version: "3.12.4"
+          python-version: "3.13"
 
       - name: Install Black and PyInstaller
         run: |
diff --git a/CHANGES.md b/CHANGES.md
index 4b14c8be865..ea0eb032975 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -30,6 +30,7 @@
 ### Packaging
 
 - Releases now include arm64 Linux binaries (#4773)
+- Releases now include arm64 Windows binaries and wheels (#4814)
 
 ### Output