diff --git a/CHANGELOG.md b/CHANGELOG.md
index 721d1fe0..3498f538 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,9 +3,10 @@
 ## Unreleased
 
 * python-build: Added PyPy 5.1 (#579)
+* python-build: Added PyPy 5.1 Portable
 * python-build: Added PyPy 5.0.1 (#558)
-* python-build: Added PyPy 5.0 Portable
 * python-build: Added PyPy 5.0.1 Portable
+* python-build: Added PyPy 5.0 Portable
 
 ## 20160310
 
diff --git a/plugins/python-build/share/python-build/pypy-5.1 b/plugins/python-build/share/python-build/pypy-5.1
index 2f03aad7..649715d6 100644
--- a/plugins/python-build/share/python-build/pypy-5.1
+++ b/plugins/python-build/share/python-build/pypy-5.1
@@ -3,13 +3,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   if require_distro "Ubuntu 10.04" 1>/dev/null 2>&1; then
     install_package "pypy-5.1.0-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.1.0-linux.tar.bz2#2f6c521b5b3c1082eab58be78655aa01ec400d19baeec93c455864a7483b8744" "pypy" verify_py27 ensurepip
   else
-    { echo
-      colorize 1 "ERROR"
-      echo ": The portable binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-      echo "try 'pypy-5.1.0-src' to build from soruce."
-      echo
-    } >&2
-    exit 1
+    install_package "pypy-5.1-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-5.1-linux_i686-portable.tar.bz2#893507603a58b8983b69924e60591de39b8f71f70ba36d6e3894db8f7c49c3ea" "pypy" verify_py27 ensurepip
   fi
   ;;
 "linux-armel" )
@@ -36,13 +30,7 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   if require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" 1>/dev/null 2>&1; then
     install_package "pypy-5.1.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.1.0-linux64.tar.bz2#0e8913351d043a50740b98cb89d99852b8bd6d11225a41c8abfc0baf7084cbf6" "pypy" verify_py27 ensurepip
   else
-    { echo
-      colorize 1 "ERROR"
-      echo ": The portable binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
-      echo "try 'pypy-5.1.0-src' to build from soruce."
-      echo
-    } >&2
-    exit 1
+    install_package "pypy-5.1-linux_x86_64-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-5.1-linux_x86_64-portable.tar.bz2#893507603a58b8983b69924e60591de39b8f71f70ba36d6e3894db8f7c49c3ea" "pypy" verify_py27 ensurepip
   fi
   ;;
 "osx64" )
diff --git a/plugins/python-build/share/python-build/pypy-portable-5.1 b/plugins/python-build/share/python-build/pypy-portable-5.1
new file mode 100644
index 00000000..d2b34bdc
--- /dev/null
+++ b/plugins/python-build/share/python-build/pypy-portable-5.1
@@ -0,0 +1,16 @@
+case "$(pypy_architecture 2>/dev/null || true)" in
+"linux" )
+  install_package "pypy-5.1-linux_i686-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-5.1-linux_i686-portable.tar.bz2#893507603a58b8983b69924e60591de39b8f71f70ba36d6e3894db8f7c49c3ea" "pypy" verify_py27 ensurepip
+  ;;
+"linux64" )
+  install_package "pypy-5.1-linux_x86_64-portable" "https://bitbucket.org/squeaky/portable-pypy/downloads/pypy-5.1-linux_x86_64-portable.tar.bz2#b2df9b0127457d1c3cc0dc9b8f027a53569ccd3ba5a79012d641e576d9cc003a" "pypy" verify_py27 ensurepip
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": Portable PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac