diff --git a/scripts/package.sh b/scripts/package.sh
index 0dc7d3503653e..a9135f732fa3e 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -59,6 +59,11 @@ if [[ "$version" == "" ]]; then
 	version="$(execrelative ./version.sh)"
 fi
 
+# armv7 isn't a real architecture, so we need to remap it to armhf.
+if [[ "$arch" == "arm" ]] || [[ "$arch" == "armv7" ]]; then
+	arch="armhf"
+fi
+
 # Make temporary dir where all source files intended to be in the package will
 # be hardlinked from.
 cdroot