2 files changed, 9 insertions, 3 deletions

diff --git a/electron-builder.yml b/electron-builder.yml
index 93c59e52e..f0a26b2d0 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -59,11 +59,11 @@ win:
   icon: ./build-helpers/images/icon.ico
   target:
     - target: nsis
-      arch: [x64, ia32]
+      arch: [x64, ia32, arm64]
     - target: msi
       arch: [x64, ia32]
     - target: portable
-      arch: [x64, ia32]
+      arch: [x64, ia32, arm64]
   # The name of the CN appearing in the certificate must be present in the publisherName list below
   publisherName: ["Ferdium Contributors", "Ambroise Grau"]
 
diff --git a/scripts/build-windows.ps1 b/scripts/build-windows.ps1
index 9f770dea1..ee0d67210 100644
--- a/scripts/build-windows.ps1
+++ b/scripts/build-windows.ps1
@@ -151,7 +151,13 @@ Pop-Location
 
 # -----------------------------------------------------------------------------
 Write-Host "*************** Building app ***************"
-$TARGET_ARCH="x64"
+if ($env:PROCESSOR_ARCHITECTURE -eq "ARM64") {
+    $TARGET_ARCH="arm64"
+}
+else
+{
+    $TARGET_ARCH="x64"
+}
 & $BASE_CMD run build -- --$TARGET_ARCH --dir
 
 Write-Host "*************** App successfully built! ***************"