diff --git a/.goreleaser.yml b/.goreleaser.yml
index 377b1920fc8..acedd5a1d75 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -35,6 +35,22 @@ builds:
     # ARM
     id: arduino_cli_arm
     binary: arduino-cli
+    env:
+      - CGO_ENABLED=1
+      - CC=/usr/arm-linux-gnueabi/bin/cc
+    goos:
+      - linux
+    goarch:
+      - arm
+    goarm:
+      - 6
+    ldflags:
+      - -s -w -X github.com/arduino/arduino-cli/version.versionString={{.Tag}} -X github.com/arduino/arduino-cli/version.commit=={{ .ShortCommit }}
+      - "-extldflags '-static'"
+  -
+    # ARMv7
+    id: arduino_cli_armv7
+    binary: arduino-cli
     env:
       - CGO_ENABLED=1
       - CC=/usr/arm-linux-gnueabihf/bin/cc
diff --git a/install.sh b/install.sh
index c23290b6f2e..686faa76cf6 100755
--- a/install.sh
+++ b/install.sh
@@ -34,7 +34,7 @@ initArch() {
 	ARCH=$(uname -m)
 	case $ARCH in
 		armv5*) ARCH="armv5";;
-		armv6*) ARCH="armv6";;
+		armv6*) ARCH="ARMv6";;
 		armv7*) ARCH="ARMv7";;
 		aarch64) ARCH="ARM64";;
 		x86) ARCH="32bit";;