diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index e6b94f94..7110b43c 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -841,8 +841,18 @@ pypy_architecture() {
 build_package_pypy() {
   build_package_copy
   { if [ ! -x "${PREFIX_PATH}/bin/python" ]; then
+      local pypy
       if [ -x "${PREFIX_PATH}/bin/pypy" ]; then
-        ( cd "${PREFIX_PATH}/bin" && ln -fs "pypy" "python" )
+        pypy="${PREFIX_PATH}/bin/pypy"
+      elif [ -x "${PREFIX_PATH}/bin/pypy3" ]; then
+        pypy="${PREFIX_PATH}/bin/pypy3"
+      fi
+      if [ -e "${pypy}" ]; then
+        if [ -L "${pypy}" ]; then
+          ( cd "${PREFIX_PATH}/bin" && ln -fs "$(resolve_link "${pypy}")" "python" )
+        else
+          ( cd "${PREFIX_PATH}/bin" && ln -fs "${pypy}" "python" )
+        fi
       else
         echo "not a pypy binary distribution" 1>&3
         return 1
diff --git a/plugins/python-build/share/python-build/pypy3-2.4.0 b/plugins/python-build/share/python-build/pypy3-2.4.0
new file mode 100644
index 00000000..c2e6cf0f
--- /dev/null
+++ b/plugins/python-build/share/python-build/pypy3-2.4.0
@@ -0,0 +1,38 @@
+case "$(pypy_architecture 2>/dev/null || true)" in
+"linux" )
+  require_distro "Ubuntu 10.04" || true
+  install_package "pypy3-2.4.0-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.4.0-linux.tar.bz2#108fdcccfddb9b2cb2fc3cbca5e6f7902ed3ab74a24c8ae29da7fbdadbab4345" "pypy" verify_py32 ensurepip
+  ;;
+"linux-armel" )
+  require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" || true
+  install_package "pypy3-2.4.0-linux-armel" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.4.0-linux-armel.tar.bz2#322ddc863006a97d48edc302a73bb0981bbc142951237ed161ca0ca2cd02831f" "pypy" verify_py32 ensurepip
+  ;;
+"linux-armhf")
+  if [[ "$(cat /etc/issue 2>/dev/null || true)" == "Raspbian"* ]]; then
+    install_package "pypy3-2.4.0-linux-armhf-raspbian" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.4.0-linux-armhf-raspbian.tar.bz2#ad8f00255c85bf3c1012d56d5638c7aee12bc9f1ddcdaad35985bbd65a16c602" "pypy" verify_py32 ensurepip
+  else
+    require_distro "Ubuntu 13.04" || true
+    install_package "pypy3-2.4.0-linux-armhf-raring" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.4.0-linux-armhf-raring.tar.bz2#eb41a3ee62741199aeeab818553ded460db991911609acf36e5710f491e5ac0a" "pypy" verify_py32 ensurepip
+  fi
+  ;;
+"linux64" )
+  require_distro "Ubuntu 12.04" || true
+  install_package "pypy3-2.4.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.4.0-linux64.tar.bz2#24e680b1742af7361107876a421dd793f5ef852dd5f097546f84b1378f7f70cc" "pypy" verify_py32 ensurepip
+  ;;
+"osx64" )
+  install_package "pypy3-2.4.0-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.4.0-osx64.tar.bz2#dcd86bdb753e93dbf55e1f3af3ffa97eea328b8b77aa60e92ea2260a6258cedb" "pypy" verify_py32 ensurepip
+  ;;
+"win32" )
+  # FIXME: never tested on Windows
+  install_zip "pypy3-2.4.0-win32" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.4.0-win32.zip#7ea499993b07405898dee9435836220d8c7b8abfa1b1f760c4a1c04b43945797" "pypy" verify_py32 ensurepip
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
+    echo "try 'pypy3-2.4.0-src' to build from soruce."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac