diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index e2b9f018..ea1599f7 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -586,7 +586,7 @@ build_package_pypy_builder() {
   if [ -f "rpython/bin/rpython" ]; then # pypy 2.x
     python "rpython/bin/rpython" -Ojit "pypy/goal/targetpypystandalone.py" >&4 2>&1
   elif [ -f "pypy/translator/goal/translate.py" ]; then # pypy 1.x
-    ( cd "pypy/translator/goal" && python "translate.py" --out=jit "targetpypystandalone.py" ) 1>&4 2>&1
+    ( cd "pypy/translator/goal" && python "translate.py" --opt=jit "targetpypystandalone.py" ) 1>&4 2>&1
   else
     echo "not a pypy source tree" 1>&3
     return 1
diff --git a/plugins/python-build/share/python-build/pypy-1.5 b/plugins/python-build/share/python-build/pypy-1.5
new file mode 100644
index 00000000..219b976f
--- /dev/null
+++ b/plugins/python-build/share/python-build/pypy-1.5
@@ -0,0 +1,26 @@
+case "$(uname -s)" in
+"Darwin" )
+  install_package "pypy-c-jit-43780-b590cf6de419-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-osx64.tar.bz2#b1417916bc01ebb9f95c666f5e397fb5" pypy verify_py27
+  ;;
+"Linux" )
+  case "$(uname -m)" in
+  "i386" | "i486" | "i586" | "i686" | "i786" )
+    install_package "pypy-c-jit-43780-b590cf6de419-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-linux.tar.bz2#08a2c95163c95f91772abb8bf5f8b9cb" pypy verify_py27
+    ;;
+  "x86_64" )
+    install_package "pypy-c-jit-43780-b590cf6de419-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-linux64.tar.bz2#32392b7986eb34cd657d5b6c5d242cc7" pypy verify_py27
+    ;;
+  esac
+  ;;
+"CYGWIN"* | "MINGW"* )
+  # FIXME: never tested on Windows
+  install_zip "pypy-1.5.0a0-win32" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-win32.zip#b6cc12bed5e7243ed44aa3430eb14885" pypy verify_py27
+  ;;
+* )
+  echo "pypy-1.5 is not available." 1>&2
+  exit 1
+  ;;
+esac
+
+install_package "distribute-0.6.43" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.43.tar.gz#a216a46dc9bec5835fa3c6041f1c77c2" python
+install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
diff --git a/plugins/python-build/share/python-build/pypy-1.5-src b/plugins/python-build/share/python-build/pypy-1.5-src
new file mode 100644
index 00000000..fa3e9ae0
--- /dev/null
+++ b/plugins/python-build/share/python-build/pypy-1.5-src
@@ -0,0 +1,3 @@
+install_package "pypy-1.5-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-src.tar.bz2" "pypy_builder" verify_py27
+install_package "distribute-0.6.43" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.43.tar.gz#a216a46dc9bec5835fa3c6041f1c77c2" python
+install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
diff --git a/plugins/python-build/share/python-build/pypy-1.6 b/plugins/python-build/share/python-build/pypy-1.6
new file mode 100644
index 00000000..ffa0c8d3
--- /dev/null
+++ b/plugins/python-build/share/python-build/pypy-1.6
@@ -0,0 +1,26 @@
+case "$(uname -s)" in
+"Darwin" )
+  install_package "pypy-1.6" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.6-osx64.tar.bz2#78bbf70f55e9fec20d7ac22531a997fc" pypy verify_py27
+  ;;
+"Linux" )
+  case "$(uname -m)" in
+  "i386" | "i486" | "i586" | "i686" | "i786" )
+    install_package "pypy-1.6" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.6-linux.tar.bz2#ee949986fc5ec5c4a11ecbd546b87fbb" pypy verify_py27
+    ;;
+  "x86_64" )
+    install_package "pypy-1.6" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.6-linux64.tar.bz2#a34e3113508449393e874f409dd888fc" pypy verify_py27
+    ;;
+  esac
+  ;;
+"CYGWIN"* | "MINGW"* )
+  # FIXME: never tested on Windows
+  install_zip "pypy-1.6" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.6-win32-c.zip#62b9eb914954aeab32905d632d3904f1" pypy verify_py27
+  ;;
+* )
+  echo "pypy-1.6 is not available." 1>&2
+  exit 1
+  ;;
+esac
+
+install_package "distribute-0.6.43" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.43.tar.gz#a216a46dc9bec5835fa3c6041f1c77c2" python
+install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
diff --git a/plugins/python-build/share/python-build/pypy-1.7 b/plugins/python-build/share/python-build/pypy-1.7
new file mode 100644
index 00000000..c8b48e58
--- /dev/null
+++ b/plugins/python-build/share/python-build/pypy-1.7
@@ -0,0 +1,26 @@
+case "$(uname -s)" in
+"Darwin" )
+  install_package "pypy-1.7" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-osx64.tar.bz2#ff979054fc8e17b4973ffebb9844b159" pypy verify_py27
+  ;;
+"Linux" )
+  case "$(uname -m)" in
+  "i386" | "i486" | "i586" | "i686" | "i786" )
+    install_package "pypy-1.7" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-linux.tar.bz2#8a6e2583902bc6f2661eb3c96b45f4e3" pypy verify_py27
+    ;;
+  "x86_64" )
+    install_package "pypy-1.7" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-linux64.tar.bz2#ceb8dfe7d9d1aeb558553b91b381a1a8" pypy verify_py27
+    ;;
+  esac
+  ;;
+"CYGWIN"* | "MINGW"* )
+  # FIXME: never tested on Windows
+  install_zip "pypy-1.7" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-win32.zip#08de1ed4a4382559b1c4c46650f4a8e8" pypy verify_py27
+  ;;
+* )
+  echo "pypy-1.7 is not available." 1>&2
+  exit 1
+  ;;
+esac
+
+install_package "distribute-0.6.43" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.43.tar.gz#a216a46dc9bec5835fa3c6041f1c77c2" python
+install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python