diff --git a/plugins/python-build/share/python-build/pypy-2.1 b/plugins/python-build/share/python-build/pypy-2.1
index cc280310..d2f56415 100644
--- a/plugins/python-build/share/python-build/pypy-2.1
+++ b/plugins/python-build/share/python-build/pypy-2.1
@@ -9,9 +9,17 @@ 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" )
-    package_name="pypy-2.1"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux-armhf-raring.tar.bz2#563a97875c342459c277cdd567c83af8"
+  "armhf" | "armv6l" | "armv7l" )
+    case "$(cat /etc/issue 2>/dev/null || true)" in
+    "Raspbian"* )
+      package_name="pypy-2.1"
+      package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux-armhf-raspbian.tar.bz2#56de3739f73072dfd53c7249dd04603a"
+      ;;
+    "Ubuntu"* )
+      package_name="pypy-2.1"
+      package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux-armhf-raring.tar.bz2#563a97875c342459c277cdd567c83af8"
+      ;;
+    esac
     ;;
   "i386" | "i486" | "i586" | "i686" | "i786" )
     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 4a586688..0ffd349a 100644
--- a/plugins/python-build/share/python-build/pypy-2.2
+++ b/plugins/python-build/share/python-build/pypy-2.2
@@ -9,9 +9,17 @@ 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" )
-    package_name="pypy-2.2-linux-armhf-raring"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-linux-armhf-raring.tar.bz2#830fdcfafae461d8e72daa94a1ab4499"
+  "armhf" | "armv6l" | "armv7l" )
+    case "$(cat /etc/issue 2>/dev/null || true)" in
+    "Raspbian"* )
+      package_name="pypy-2.2-linux-armhf-raspbian"
+      package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-linux-armhf-raspbian.tar.bz2#e9c9f28cba22d07445e9195c1d2fede6"
+      ;;
+    "Ubuntu"* )
+      package_name="pypy-2.2-linux-armhf-raring"
+      package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-linux-armhf-raring.tar.bz2#830fdcfafae461d8e72daa94a1ab4499"
+      ;;
+    esac
     ;;
   "i386" | "i486" | "i586" | "i686" | "i786" )
     package_name="pypy-2.2-linux"
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 454576f2..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,9 +9,17 @@ 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" )
-    package_name="pypy-2.2.1-linux-armhf-raring"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-linux-armhf-raring.tar.bz2#278e0ceb961bd0f49af53a01301601d4"
+  "armhf" | "armv6l" | "armv7l" )
+    case "$(cat /etc/issue 2>/dev/null || true)" in
+    "Raspbian"* )
+      package_name="pypy-2.2.1-linux-armhf-raspbian"
+      package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-linux-armhf-raspbian.tar.bz2#dcb1803b109a43b3a5b166bb1f7c4736"
+      ;;
+    "Ubuntu"* )
+      package_name="pypy-2.2.1-linux-armhf-raring"
+      package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-linux-armhf-raring.tar.bz2#278e0ceb961bd0f49af53a01301601d4"
+      ;;
+    esac
     ;;
   "i386" | "i486" | "i586" | "i686" | "i786" )
     package_name="pypy-2.2.1-linux"
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 c4002b95..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,9 +9,17 @@ 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" )
-    package_name="pypy3-2.1-beta1-linux-armhf-raring"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-linux-armhf-raring.tar.bz2#55b82b199ccf537c7ea5e2f31df78dfe"
+  "armhf" | "armv6l" | "armv7l" )
+    case "$(cat /etc/issue 2>/dev/null || true)" in
+    "Raspbian"* )
+      package_name="pypy3-2.1-beta1-linux-armhf-raspbian"
+      package_url="https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-linux-armhf-raspbian.tar.bz2#a43e64557fe27b979a8546a89c05652f"
+      ;;
+    "Ubuntu"* )
+      package_name="pypy3-2.1-beta1-linux-armhf-raring"
+      package_url="https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-linux-armhf-raring.tar.bz2#55b82b199ccf537c7ea5e2f31df78dfe"
+      ;;
+    esac
     ;;
   "i386" | "i486" | "i586" | "i686" | "i786" )
     package_name="pypy3-2.1-beta1-linux"