diff --git a/plugins/python-build/share/python-build/pypy-2.1 b/plugins/python-build/share/python-build/pypy-2.1
new file mode 100644
index 00000000..a72c60ec
--- /dev/null
+++ b/plugins/python-build/share/python-build/pypy-2.1
@@ -0,0 +1,33 @@
+case "$(uname -s)" in
+"Darwin" )
+  install_package "pypy-2.1" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-osx64.tar.bz2#2a9b66d1511335183108428436fe4184" "pypy" verify_py27
+  ;;
+"Linux" )
+  case "$(uname -m)" in
+  "armel" )
+    install_package "pypy-2.1" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux-armel.tar.bz2#48cdb54c54153d219670a8a56364e9cb" "pypy" verify_py27
+  ;;
+  "armhf" )
+    install_package "pypy-2.1" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux-armhf-raring.tar.bz2#563a97875c342459c277cdd567c83af8" "pypy" verify_py27
+  ;;
+  "i386" | "i486" | "i586" | "i686" | "i786" )
+    install_package "pypy-2.1" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux.tar.bz2#dd6b4f4f52ab1bebe30b32dc4085757a" "pypy" verify_py27
+  ;;
+  "x86_64" )
+    install_package "pypy-2.1" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux64.tar.bz2#80ef61f3b1b15fd0bd94fa5cdf8a005f" "pypy" verify_py27
+  esac
+  ;;
+"CYGWIN"* | "MINGW"* )
+  # FIXME: never tested on Windows
+  install_zip "pypy-2.1" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-win32.zip#9943c7a008535c99fed6bbe1c5a22797" "pypy" verify_py27
+  ;;
+* )
+  { echo "Precompiled binary of pypy-2.1 is not available for $(uname -s)-$(uname -m)."
+    echo "To build pypy-2.1 from soruce, use 'pypy-2.1-src'."
+  } 1>&4 2>&1
+  false
+  ;;
+esac
+
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python
diff --git a/plugins/python-build/share/python-build/pypy-2.1-src b/plugins/python-build/share/python-build/pypy-2.1-src
new file mode 100644
index 00000000..3a692419
--- /dev/null
+++ b/plugins/python-build/share/python-build/pypy-2.1-src
@@ -0,0 +1,4 @@
+require_gcc
+install_package "pypy-2.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-src.tar.bz2#7c43cd95aa37a7f0ca2465ed930646c0" "pypy_builder" verify_py27
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python