diff --git a/plugins/python-build/share/python-build/pypy-2.1 b/plugins/python-build/share/python-build/pypy-2.1
index c9104397..d2f56415 100644
--- a/plugins/python-build/share/python-build/pypy-2.1
+++ b/plugins/python-build/share/python-build/pypy-2.1
@@ -9,7 +9,7 @@ case "$(uname -s)" in
     package_name="pypy-2.1"
     package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux-armel.tar.bz2#48cdb54c54153d219670a8a56364e9cb"
     ;;
-  "armhf" )
+  "armhf" | "armv6l" | "armv7l" )
     case "$(cat /etc/issue 2>/dev/null || true)" in
     "Raspbian"* )
       package_name="pypy-2.1"
diff --git a/plugins/python-build/share/python-build/pypy-2.2 b/plugins/python-build/share/python-build/pypy-2.2
index bf5339f6..0ffd349a 100644
--- a/plugins/python-build/share/python-build/pypy-2.2
+++ b/plugins/python-build/share/python-build/pypy-2.2
@@ -9,7 +9,7 @@ case "$(uname -s)" in
     package_name="pypy-2.2-linux-armel"
     package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-linux-armel.tar.bz2#c50373a6c2517b43c65fd84ac2cd3a6f"
     ;;
-  "armhf" )
+  "armhf" | "armv6l" | "armv7l" )
     case "$(cat /etc/issue 2>/dev/null || true)" in
     "Raspbian"* )
       package_name="pypy-2.2-linux-armhf-raspbian"
diff --git a/plugins/python-build/share/python-build/pypy-2.2.1 b/plugins/python-build/share/python-build/pypy-2.2.1
index 7244a902..7d3e5dc0 100644
--- a/plugins/python-build/share/python-build/pypy-2.2.1
+++ b/plugins/python-build/share/python-build/pypy-2.2.1
@@ -9,7 +9,7 @@ case "$(uname -s)" in
     package_name="pypy-2.2.1-linux-armel"
     package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-linux-armel.tar.bz2#0127094c36f985f6c2b4ed82be3fb6c8"
     ;;
-  "armhf" )
+  "armhf" | "armv6l" | "armv7l" )
     case "$(cat /etc/issue 2>/dev/null || true)" in
     "Raspbian"* )
       package_name="pypy-2.2.1-linux-armhf-raspbian"
diff --git a/plugins/python-build/share/python-build/pypy3-2.1-beta1 b/plugins/python-build/share/python-build/pypy3-2.1-beta1
index 9c000e21..add0b2b8 100644
--- a/plugins/python-build/share/python-build/pypy3-2.1-beta1
+++ b/plugins/python-build/share/python-build/pypy3-2.1-beta1
@@ -9,7 +9,7 @@ case "$(uname -s)" in
     package_name="pypy3-2.1-beta1-linux-armel"
     package_url="https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-linux-armel.tar.bz2#d57d0d0d3c49c7cce75440924d8f66b7"
     ;;
-  "armhf" )
+  "armhf" | "armv6l" | "armv7l" )
     case "$(cat /etc/issue 2>/dev/null || true)" in
     "Raspbian"* )
       package_name="pypy3-2.1-beta1-linux-armhf-raspbian"