diff --git a/plugins/python-build/bin/pyenv-install b/plugins/python-build/bin/pyenv-install
index 79c171b2..f9ee37ec 100755
--- a/plugins/python-build/bin/pyenv-install
+++ b/plugins/python-build/bin/pyenv-install
@@ -200,7 +200,7 @@ if [ -z "${PYENV_BOOTSTRAP_VERSION}" ]; then
       done
     done
     ;;
-  "pypy-dev" | "pypy-"*"-src" | "pypy3-"*"-src" )
+  "pypy"*"-dev" | "pypy"*"-src" )
     # PyPy/PyPy3 requires existing Python 2.7 to build
     if [ -n "${PYENV_RPYTHON_VERSION}" ]; then
       PYENV_BOOTSTRAP_VERSION="${PYENV_RPYTHON_VERSION}"
@@ -213,10 +213,12 @@ if [ -z "${PYENV_BOOTSTRAP_VERSION}" ]; then
       done
     fi
     if [ -n "$PYENV_BOOTSTRAP_VERSION" ]; then
-      if ! PYENV_VERSION="$PYENV_BOOTSTRAP_VERSION" pyenv-exec python -c 'import curses' 1>/dev/null 2>&1; then
-        echo "pyenv-install: $VERSION_NAME: PyPy requires \`curses' in $PYENV_BOOTSTRAP_VERSION to build from source." >&2
-        exit 1
-      fi
+      for dep in curses genc pycparser; do
+        if ! PYENV_VERSION="$PYENV_BOOTSTRAP_VERSION" pyenv-exec python -c "import ${dep}" 1>/dev/null 2>&1; then
+          echo "pyenv-install: $VERSION_NAME: PyPy requires \`${dep}' in $PYENV_BOOTSTRAP_VERSION to build from source." >&2
+          exit 1
+        fi
+      done
     else
       echo "pyenv-install: $VERSION_NAME: PyPy requires Python 2.7 to build from source." >&2
       exit 1
diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index ae34bb64..1037006d 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -985,40 +985,50 @@ pyston_architecture() {
 build_package_pypy() {
   build_package_copy
   mkdir -p "${PREFIX_PATH}/bin" "${PREFIX_PATH}/lib"
-  local pypy libpypy python
+  local bin
   shopt -s nullglob
-  for pypy in "bin/pypy"*; do
-    case "${pypy##*/}" in
-    "pypy-stm" )
-      python="bin/python"
-      ;;
-    * )
-      python="$(basename "${pypy}" | sed -e 's/pypy/python/')"
-      ;;
-    esac
-    ( cd "${PREFIX_PATH}/bin" && ln -fs "${pypy##*/}" "${python##*/}" )
-  done
-  for libpypy in "bin/libpypy-c."*; do
-    ( cd "${PREFIX_PATH}/lib" && ln -fs "../bin/$(basename "${libpypy}")" "$(basename "${libpypy}")" )
+  for bin in "bin/"*; do
+    if [ -f "${bin}" ] && [ -x "${bin}" ] && [ ! -L "${bin}" ]; then
+      case "${bin##*/}" in
+      "libpypy"* )
+        ( cd "${PREFIX_PATH}/lib" && ln -fs "../bin/${bin##*/}" "${bin##*/}" )
+        ;;
+      "pypy"* )
+        ( cd "${PREFIX_PATH}/bin" && ln -fs "${bin##*/}" "python" )
+        ;;
+      esac
+    fi
   done
   shopt -u nullglob
 }
 
 build_package_pypy_builder() {
   if [ -f "rpython/bin/rpython" ]; then # pypy 2.x
-    python "rpython/bin/rpython" ${PYPY_OPTS:-"-Ojit"} "pypy/goal/targetpypystandalone.py" >&4 2>&1
+    if [ -z "${PYPY_OPTS}" ]; then
+      local PYPY_OPTS="--opt=jit --batch --make-jobs=$(num_cpu_cores)"
+    fi
+    python "rpython/bin/rpython" ${PYPY_OPTS} "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" ${PYPY_OPTS:-"--opt=jit"} "targetpypystandalone.py" ) 1>&4 2>&1
+    if [ -z "${PYPY_OPTS}" ]; then
+      local PYPY_OPTS="--opt=jit"
+    fi
+    ( cd "pypy/translator/goal" && python "translate.py" ${PYPY_OPTS} "targetpypystandalone.py" ) 1>&4 2>&1
   else
     echo "not a pypy source tree" 1>&3
     return 1
   fi
   { mkdir -p "bin" "lib"
-    if [ -x "pypy-c" ]; then
-      mv -f "pypy-c" "bin/pypy"
-    fi
-    for libpypy in "libpypy-c."*; do
-      mv -f "${libpypy}" "bin/"
+    local pypy
+    for pypy in "pypy"*; do
+      if [ -f "${pypy}" ] && [ -x "${pypy}" ] && [ ! -L "${pypy}" ]; then
+        mv -f "${pypy}" "bin/${pypy##*/}"
+      fi
+    done
+    local libpypy
+    for libpypy in "libpypy"*; do
+      if [ -f "${libpypy}" ] && [ -x "${libpypy}" ] && [ ! -L "${libpypy}" ]; then
+        mv -f "${libpypy}" "bin/${libpypy##*/}"
+      fi
     done
   } >&4 2>&1
   build_package_pypy
diff --git a/plugins/python-build/share/python-build/pypy-1.5-src b/plugins/python-build/share/python-build/pypy-1.5-src
index e06bb230..75808a4d 100644
--- a/plugins/python-build/share/python-build/pypy-1.5-src
+++ b/plugins/python-build/share/python-build/pypy-1.5-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-1.5-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-src.tar.bz2" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-1.7-dev b/plugins/python-build/share/python-build/pypy-1.7-dev
index bdfd8a2d..0a09458e 100644
--- a/plugins/python-build/share/python-build/pypy-1.7-dev
+++ b/plugins/python-build/share/python-build/pypy-1.7-dev
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_hg "pypy-1.7-dev" "https://bitbucket.org/pypy/pypy" "release-1.7.x" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-1.8-dev b/plugins/python-build/share/python-build/pypy-1.8-dev
index e397c6f1..c25cf248 100644
--- a/plugins/python-build/share/python-build/pypy-1.8-dev
+++ b/plugins/python-build/share/python-build/pypy-1.8-dev
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_hg "pypy-1.8-dev" "https://bitbucket.org/pypy/pypy" "release-1.8.x" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-1.9-dev b/plugins/python-build/share/python-build/pypy-1.9-dev
index 3bae4ff0..505dbcdb 100644
--- a/plugins/python-build/share/python-build/pypy-1.9-dev
+++ b/plugins/python-build/share/python-build/pypy-1.9-dev
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_hg "pypy-1.9-dev" "https://bitbucket.org/pypy/pypy" "release-1.9.x" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.0-dev b/plugins/python-build/share/python-build/pypy-2.0-dev
index 3b11e0d6..e8c9a6f4 100644
--- a/plugins/python-build/share/python-build/pypy-2.0-dev
+++ b/plugins/python-build/share/python-build/pypy-2.0-dev
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_hg "pypy-2.0-dev" "https://bitbucket.org/pypy/pypy" "release-2.0.x" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.0-src b/plugins/python-build/share/python-build/pypy-2.0-src
index bd983c90..4a561c29 100644
--- a/plugins/python-build/share/python-build/pypy-2.0-src
+++ b/plugins/python-build/share/python-build/pypy-2.0-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-2.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-src.tar.bz2#d92dfd418beac915d3efc28f8a2090f3c13a89ec653419deff3d7112c5c111f3" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.0.1-src b/plugins/python-build/share/python-build/pypy-2.0.1-src
index 4228d85e..3204cc3a 100644
--- a/plugins/python-build/share/python-build/pypy-2.0.1-src
+++ b/plugins/python-build/share/python-build/pypy-2.0.1-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-2.0.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.1-src.tar.bz2#d1327bc325545939236ac609ec509548a545f97b1c933dedbe42f2482a130aa0" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.0.2-src b/plugins/python-build/share/python-build/pypy-2.0.2-src
index 66ee189c..d5e38403 100644
--- a/plugins/python-build/share/python-build/pypy-2.0.2-src
+++ b/plugins/python-build/share/python-build/pypy-2.0.2-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-2.0.2-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.2-src.tar.bz2#1991c90d6b98e2408b3790d4b57b71ec1c69346328b8321505ce8f6ab4544c3c" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.1-src b/plugins/python-build/share/python-build/pypy-2.1-src
index 2e975369..b3035b09 100644
--- a/plugins/python-build/share/python-build/pypy-2.1-src
+++ b/plugins/python-build/share/python-build/pypy-2.1-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-2.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-src.tar.bz2#31b3066c9739b117d6bb1bdc485a919dc3b67370ec00437de1b74069943f7f17" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.2-src b/plugins/python-build/share/python-build/pypy-2.2-src
index 7f7167f9..e59e8714 100644
--- a/plugins/python-build/share/python-build/pypy-2.2-src
+++ b/plugins/python-build/share/python-build/pypy-2.2-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-2.2-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-src.tar.bz2#50fffcb86039e019530a63d656580bc53c173e5f19768bddd8699cd08448e04e" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.2.1-src b/plugins/python-build/share/python-build/pypy-2.2.1-src
index d7b588c3..82e7b73b 100644
--- a/plugins/python-build/share/python-build/pypy-2.2.1-src
+++ b/plugins/python-build/share/python-build/pypy-2.2.1-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-2.2.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-src.tar.bz2#252045187e443656a2beb412dadac9296e8fe8db0f75a66ed5265db58c35035f" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.3-src b/plugins/python-build/share/python-build/pypy-2.3-src
index d9d87353..b749cf7b 100644
--- a/plugins/python-build/share/python-build/pypy-2.3-src
+++ b/plugins/python-build/share/python-build/pypy-2.3-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-pypy-394146e9bb67" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.3-src.tar.bz2#be2c271e7f9d7c0059a551ba1501713c00336e551e7f13107f0f34c721d95b0c" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.3.1-src b/plugins/python-build/share/python-build/pypy-2.3.1-src
index af152a83..4960278b 100644
--- a/plugins/python-build/share/python-build/pypy-2.3.1-src
+++ b/plugins/python-build/share/python-build/pypy-2.3.1-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-pypy-32f35069a16d" "https://bitbucket.org/pypy/pypy/get/release-2.3.1.tar.bz2#3fd10d97c0177c33ed358a78eb26f5bf1f91b266af853564b1a9d8c310a1e439" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.4-beta1-src b/plugins/python-build/share/python-build/pypy-2.4-beta1-src
index 0593003d..e44eae23 100644
--- a/plugins/python-build/share/python-build/pypy-2.4-beta1-src
+++ b/plugins/python-build/share/python-build/pypy-2.4-beta1-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-pypy-9f425c60afdf" "https://bitbucket.org/pypy/pypy/get/release-2.4-beta1.tar.bz2#4baa5663872cf47e18fb35232cc70503b087e0d3f927bd4cc4bbf7ef578b13bd" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.4.0-src b/plugins/python-build/share/python-build/pypy-2.4.0-src
index 3eda15fd..4a3eea1c 100644
--- a/plugins/python-build/share/python-build/pypy-2.4.0-src
+++ b/plugins/python-build/share/python-build/pypy-2.4.0-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-pypy-c6ad44ecf5d8" "https://bitbucket.org/pypy/pypy/get/release-2.4.0.tar.bz2#7e0dec2c40106f20f002121bdabb71939915254fb91bd55b01434e4b994113d2" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.5.0-src b/plugins/python-build/share/python-build/pypy-2.5.0-src
index 01910966..cc364a1a 100644
--- a/plugins/python-build/share/python-build/pypy-2.5.0-src
+++ b/plugins/python-build/share/python-build/pypy-2.5.0-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-pypy-10f1b29a2bd2" "https://bitbucket.org/pypy/pypy/get/release-2.5.0.tar.bz2#8d644a55a3150cf3d18536c784e3410bb3f3438c1505000c4f761863bacedf88" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.5.1-src b/plugins/python-build/share/python-build/pypy-2.5.1-src
index 4d5830f7..2aad4c7b 100644
--- a/plugins/python-build/share/python-build/pypy-2.5.1-src
+++ b/plugins/python-build/share/python-build/pypy-2.5.1-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-2.5.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.5.1-src.tar.bz2#ddb3a580b1ee99c5a699172d74be91c36dda9a38946d4731d8c6a63120a3ba2a" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.6.0-src b/plugins/python-build/share/python-build/pypy-2.6.0-src
index 66a84eea..794f16bf 100644
--- a/plugins/python-build/share/python-build/pypy-2.6.0-src
+++ b/plugins/python-build/share/python-build/pypy-2.6.0-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-2.6.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.6.0-src.tar.bz2#9bf353f22d25e97a85a6d3766619966055edea1ea1b2218445d683a8ad0399d9" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-2.6.1-src b/plugins/python-build/share/python-build/pypy-2.6.1-src
index 06a5d67b..f41ed07d 100644
--- a/plugins/python-build/share/python-build/pypy-2.6.1-src
+++ b/plugins/python-build/share/python-build/pypy-2.6.1-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-2.6.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.6.1-src.tar.bz2#7fddd414c9348c2f899f79ad86adc3fc2b19443855b5243f58487e1f0ac46560" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-4.0.0-src b/plugins/python-build/share/python-build/pypy-4.0.0-src
index 2e4d7997..758f3074 100644
--- a/plugins/python-build/share/python-build/pypy-4.0.0-src
+++ b/plugins/python-build/share/python-build/pypy-4.0.0-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-4.0.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-4.0.0-src.tar.bz2#acff480e44ce92acd057f2e786775af36dc3c2cd12e9efc60a1ac6a562ad7b4d" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-4.0.1-src b/plugins/python-build/share/python-build/pypy-4.0.1-src
index d372a388..e53bd2b9 100644
--- a/plugins/python-build/share/python-build/pypy-4.0.1-src
+++ b/plugins/python-build/share/python-build/pypy-4.0.1-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-4.0.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-4.0.1-src.tar.bz2#29f5aa6ba17b34fd980e85172dfeb4086fdc373ad392b1feff2677d2d8aea23c" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-5.0.0-src b/plugins/python-build/share/python-build/pypy-5.0.0-src
index 186f32f5..559981e2 100644
--- a/plugins/python-build/share/python-build/pypy-5.0.0-src
+++ b/plugins/python-build/share/python-build/pypy-5.0.0-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-5.0.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-src.tar.bz2#89027b1b33553b53ff7733dc4838f0a76af23552c0d915d9f6de5875b8d7d4ab" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-5.0.1-src b/plugins/python-build/share/python-build/pypy-5.0.1-src
index 402757fc..efad8edc 100644
--- a/plugins/python-build/share/python-build/pypy-5.0.1-src
+++ b/plugins/python-build/share/python-build/pypy-5.0.1-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-5.0.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.1-src.tar.bz2#1573c9284d3ec236c8e6ef3b954753932dff29462c54b5885b761d1ee68b6e05" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-5.1-src b/plugins/python-build/share/python-build/pypy-5.1-src
index b51d0089..c9b50e3f 100644
--- a/plugins/python-build/share/python-build/pypy-5.1-src
+++ b/plugins/python-build/share/python-build/pypy-5.1-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-5.1.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.1.0-src.tar.bz2#16bab9501e942c0704abbf9cd6c4e950c6a76dc226cf1e447ea084916aef4714" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-5.1.1-src b/plugins/python-build/share/python-build/pypy-5.1.1-src
index 7fbdb9db..86450258 100644
--- a/plugins/python-build/share/python-build/pypy-5.1.1-src
+++ b/plugins/python-build/share/python-build/pypy-5.1.1-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy-5.1.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-5.1.1-src.tar.bz2#ca3d943d7fbd78bb957ee9e5833ada4bb8506ac99a41b7628790e286a65ed2be" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy-dev b/plugins/python-build/share/python-build/pypy-dev
index a9982a99..4642e12a 100644
--- a/plugins/python-build/share/python-build/pypy-dev
+++ b/plugins/python-build/share/python-build/pypy-dev
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_hg "pypy-dev" "https://bitbucket.org/pypy/pypy" "default" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy2-5.3-src b/plugins/python-build/share/python-build/pypy2-5.3-src
index 89855977..e8334fa0 100644
--- a/plugins/python-build/share/python-build/pypy2-5.3-src
+++ b/plugins/python-build/share/python-build/pypy2-5.3-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy2-v5.3.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.3.0-src.tar.bz2#4142eb8f403810bc88a4911792bb5a502e152df95806e33e69050c828cd160d5" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy2-5.3.1-src b/plugins/python-build/share/python-build/pypy2-5.3.1-src
index 3a605063..1bb4b1c4 100644
--- a/plugins/python-build/share/python-build/pypy2-5.3.1-src
+++ b/plugins/python-build/share/python-build/pypy2-5.3.1-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy2-v5.3.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.3.1-src.tar.bz2#31a52bab584abf3a0f0defd1bf9a29131dab08df43885e7eeddfc7dc9b71836e" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy2-5.4-src b/plugins/python-build/share/python-build/pypy2-5.4-src
index dd231434..53a35a0e 100644
--- a/plugins/python-build/share/python-build/pypy2-5.4-src
+++ b/plugins/python-build/share/python-build/pypy2-5.4-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy2-v5.4.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.4.0-src.tar.bz2#d9568ebe9a14d0eaefde887d78f3cba63d665e95c0d234bb583932341f55a655" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy2-5.4.1-src b/plugins/python-build/share/python-build/pypy2-5.4.1-src
index 891a7a0e..11ec0613 100644
--- a/plugins/python-build/share/python-build/pypy2-5.4.1-src
+++ b/plugins/python-build/share/python-build/pypy2-5.4.1-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy2-v5.4.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.4.1-src.tar.bz2#45dbc50c81498f6f1067201b8fc887074b43b84ee32cc47f15e7db17571e9352" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy2-5.6.0-src b/plugins/python-build/share/python-build/pypy2-5.6.0-src
index 95b933c9..b399db03 100644
--- a/plugins/python-build/share/python-build/pypy2-5.6.0-src
+++ b/plugins/python-build/share/python-build/pypy2-5.6.0-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy2-v5.6.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.6.0-src.tar.bz2#7411448045f77eb9e087afdce66fe7eafda1876c9e17aad88cf891f762b608b0" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy2-5.7.0-src b/plugins/python-build/share/python-build/pypy2-5.7.0-src
index 1cf5059e..f635cfc2 100644
--- a/plugins/python-build/share/python-build/pypy2-5.7.0-src
+++ b/plugins/python-build/share/python-build/pypy2-5.7.0-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy2-v5.7.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-src.tar.bz2#e522ea7ca51b16ee5505f22b86803664b762a263a6d69ba84c359fcf8365ad3e" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy2-5.7.1-src b/plugins/python-build/share/python-build/pypy2-5.7.1-src
index 1cf5059e..f635cfc2 100644
--- a/plugins/python-build/share/python-build/pypy2-5.7.1-src
+++ b/plugins/python-build/share/python-build/pypy2-5.7.1-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy2-v5.7.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-src.tar.bz2#e522ea7ca51b16ee5505f22b86803664b762a263a6d69ba84c359fcf8365ad3e" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy2.7-5.8.0-src b/plugins/python-build/share/python-build/pypy2.7-5.8.0-src
index 047c78b2..eb281790 100644
--- a/plugins/python-build/share/python-build/pypy2.7-5.8.0-src
+++ b/plugins/python-build/share/python-build/pypy2.7-5.8.0-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy2-v5.8.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.8.0-src.tar.bz2#504c2d522595baf8775ae1045a217a2b120732537861d31b889d47c340b58bd5" "pypy_builder" verify_py27 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy3-2.3.1-src b/plugins/python-build/share/python-build/pypy3-2.3.1-src
index b150fa5c..288ebc74 100644
--- a/plugins/python-build/share/python-build/pypy3-2.3.1-src
+++ b/plugins/python-build/share/python-build/pypy3-2.3.1-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy3-2.3.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.3.1-src.tar.bz2#924ca36bf85e02469c71d451c145f9a6d19b905df473a3d1c25179c63ea79d74" "pypy_builder" verify_py32 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy3-2.4.0-src b/plugins/python-build/share/python-build/pypy3-2.4.0-src
index 28b1b46c..4fae677f 100644
--- a/plugins/python-build/share/python-build/pypy3-2.4.0-src
+++ b/plugins/python-build/share/python-build/pypy3-2.4.0-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy3-2.4.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.4.0-src.tar.bz2#d9ba207d6eecf8a0dc4414e9f4e92db1abd143e8cc6ec4a6bdcac75b29f104f3" "pypy_builder" verify_py32 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy3-dev b/plugins/python-build/share/python-build/pypy3-dev
index 839a2e22..004f66a7 100644
--- a/plugins/python-build/share/python-build/pypy3-dev
+++ b/plugins/python-build/share/python-build/pypy3-dev
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_hg "pypy3-dev" "https://bitbucket.org/pypy/pypy" "py3k" "pypy_builder" verify_py32 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy3.3-5.2-alpha1-src b/plugins/python-build/share/python-build/pypy3.3-5.2-alpha1-src
index 6cbe1bc8..6ada1e8f 100644
--- a/plugins/python-build/share/python-build/pypy3.3-5.2-alpha1-src
+++ b/plugins/python-build/share/python-build/pypy3.3-5.2-alpha1-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy3.3-v5.2.0-alpha1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3.3-v5.2.0-alpha1-src.tar.bz2#344c2f088c82ea1274964bb0505ab80d3f9e538cc03f91aa109325ddbaa61426" "pypy_builder" verify_py33 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy3.3-5.5-alpha-src b/plugins/python-build/share/python-build/pypy3.3-5.5-alpha-src
index 6f792106..711d59f0 100644
--- a/plugins/python-build/share/python-build/pypy3.3-5.5-alpha-src
+++ b/plugins/python-build/share/python-build/pypy3.3-5.5-alpha-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy3-v5.5.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3.3-v5.5.0-alpha-src.tar.bz2#d5591c34d77253e9ed57d182b6f49585b95f7c09c3e121f0e8630e5a7e75ab5f" "pypy_builder" verify_py33 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy3.5-5.7-beta-src b/plugins/python-build/share/python-build/pypy3.5-5.7-beta-src
index 129535c1..50ed4354 100644
--- a/plugins/python-build/share/python-build/pypy3.5-5.7-beta-src
+++ b/plugins/python-build/share/python-build/pypy3.5-5.7-beta-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy3-v5.7.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.7.0-src.tar.bz2#f0f563b74f8b82ec33b022393219b93cc0d81e9f9500614fe8417b67a52e9569" "pypy_builder" verify_py35 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy3.5-5.7.1-beta-src b/plugins/python-build/share/python-build/pypy3.5-5.7.1-beta-src
index 3f4fcb5c..a894ff48 100644
--- a/plugins/python-build/share/python-build/pypy3.5-5.7.1-beta-src
+++ b/plugins/python-build/share/python-build/pypy3.5-5.7.1-beta-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy3-v5.7.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.7.1-src.tar.bz2#40ece0145282980ac121390f13709404c0532896507d5767496381180b631bd0" "pypy_builder" verify_py35 ensurepip
diff --git a/plugins/python-build/share/python-build/pypy3.5-5.8.0-src b/plugins/python-build/share/python-build/pypy3.5-5.8.0-src
index b9e0e97f..b6b2e7e2 100644
--- a/plugins/python-build/share/python-build/pypy3.5-5.8.0-src
+++ b/plugins/python-build/share/python-build/pypy3.5-5.8.0-src
@@ -1,2 +1,3 @@
-require_gcc
+#require_gcc
+install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "pypy3-v5.8.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.8.0-src.tar.bz2#9d090127335c3c0fd2b14c8835bf91752e62756e55ea06aad3353f24a6854223" "pypy_builder" verify_py35 ensurepip