diff --git a/plugins/python-build/bin/pyenv-install b/plugins/python-build/bin/pyenv-install
index 72e4e964..5aaf0a52 100755
--- a/plugins/python-build/bin/pyenv-install
+++ b/plugins/python-build/bin/pyenv-install
@@ -191,11 +191,11 @@ if [[ "${VERSION_NAME}" == [23]"."* ]]; then
   done
 fi
 
-# PyPy requires existing Python 2.x to build
-if [[ "${VERSION_NAME}" == "pypy-"*"-src" ]]; then
+# PyPy/PyPy3 requires existing Python 2.7 to build
+if [[ "${VERSION_NAME}" == "pypy-"*"-src" ]] || [[ "${VERSION_NAME}" == "pypy3-"*"-src" ]]; then
   if [ -z "$PYENV_RPYTHON_VERSION" ]; then
     for version in $(pyenv-versions --bare | sort -r); do
-      if [[ "$version" == 2.[567] ]] || [[ "$version" == 2.[567].* ]]; then
+      if [[ "$version" == "2.7"* ]]; then
         PYENV_RPYTHON_VERSION="$version"
       fi
     done
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
new file mode 100644
index 00000000..28b1b46c
--- /dev/null
+++ b/plugins/python-build/share/python-build/pypy3-2.4.0-src
@@ -0,0 +1,2 @@
+require_gcc
+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