diff --git a/dev-python/cython/cython-0.20.2.recipe b/dev-python/cython/cython-0.20.2.recipe
deleted file mode 100644
index 5896d6d13..000000000
--- a/dev-python/cython/cython-0.20.2.recipe
+++ /dev/null
@@ -1,37 +0,0 @@
-SUMMARY="Optimising static compiler for Python"
-DESCRIPTION="Cython is an optimising static compiler for both the Python \
-programming language and the extended Cython programming language (based on \
-Pyrex). It makes writing C extensions for Python as easy as Python itself."
-HOMEPAGE="http://cython.org"
-COPYRIGHT="Stefan Behnel, Robert Bradshaw, Lisandro Dalcin, Mark Florisson, \
-Vitja Makarov, Dag Sverre Seljebotn"
-LICENSE="Apache v2"
-SOURCE_URI="http://cython.org/release/Cython-0.20.2.tar.gz"
-CHECKSUM_SHA256="ed13b606a2aeb5bd6c235f8ed6c9988c99d01a033d0d21d56137c13d5c7be63f"
-REVISION="1"
-
-ARCHITECTURES="x86_gcc2"
-
-PROVIDES="
-	cython = $portVersion
-	cmd:cygdb
-	cmd:cython
-"
-
-BUILD_PREREQUIRES="
-	haiku_devel
-	cmd:gcc
-	cmd:make
-	cmd:python
-"
-
-SOURCE_DIR="Cython-$portVersion"
-BUILD()
-{
-	make
-}
-
-INSTALL()
-{
-	python setup.py install --prefix=$prefix
-}
diff --git a/dev-python/cython/cython-0.23.4.recipe b/dev-python/cython/cython-0.23.4.recipe
deleted file mode 100644
index 6b742a3b7..000000000
--- a/dev-python/cython/cython-0.23.4.recipe
+++ /dev/null
@@ -1,39 +0,0 @@
-SUMMARY="Optimising static compiler for Python"
-DESCRIPTION="Cython is an optimising static compiler for both the Python \
-programming language and the extended Cython programming language (based on \
-Pyrex). It makes writing C extensions for Python as easy as Python itself."
-HOMEPAGE="http://cython.org"
-COPYRIGHT="Stefan Behnel, Robert Bradshaw, Lisandro Dalcin, Mark Florisson, \
-Vitja Makarov, Dag Sverre Seljebotn"
-LICENSE="Apache v2"
-REVISION="1"
-SOURCE_URI="https://pypi.python.org/packages/b3/89/e8dddc86bf4f144407962e04c4018f53dfe4d6ae5010d34573d8521e810e/Cython-0.23.4.tar.gz"
-CHECKSUM_SHA256="fec42fecee35d6cc02887f1eef4e4952c97402ed2800bfe41bbd9ed1a0730d8e"
-
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
-SOURCE_DIR="Cython-$portVersion"
-
-PROVIDES="
-	cython = $portVersion
-	cmd:cygdb
-	cmd:cython
-	cmd:cythonize
-"
-
-BUILD_PREREQUIRES="
-	haiku_devel
-	cmd:gcc
-	cmd:make
-	cmd:python
-"
-
-BUILD()
-{
-	make $jobArgs
-}
-
-INSTALL()
-{
-	python setup.py install --prefix=$prefix
-}
diff --git a/dev-python/cython/python3_cython-0.25.2.recipe b/dev-python/cython/python3_cython-0.25.2.recipe
new file mode 100644
index 000000000..edffab8fd
--- /dev/null
+++ b/dev-python/cython/python3_cython-0.25.2.recipe
@@ -0,0 +1,55 @@
+SUMMARY="Optimising static compiler for Python"
+DESCRIPTION="Cython is an optimising static compiler for both the Python \
+programming language and the extended Cython programming language (based on \
+Pyrex). It makes writing C extensions for Python as easy as Python itself."
+HOMEPAGE="http://cython.org/"
+COPYRIGHT="2007-2016 Stefan Behnel, Robert Bradshaw, et al."
+LICENSE="Apache v2"
+REVISION="1"
+SOURCE_URI="https://pypi.python.org/packages/b7/67/7e2a817f9e9c773ee3995c1e15204f5d01c8da71882016cac10342ef031b/Cython-0.25.2.tar.gz"
+CHECKSUM_SHA256="f141d1f9c27a07b5a93f7dc5339472067e2d7140d1c5a9e20112a5665ca60306"
+SOURCE_DIR="Cython-$portVersion"
+
+ARCHITECTURES="?x86_gcc2 x86 x86_64"
+
+PROVIDES="
+	python3_cython = $portVersion
+	cmd:cygdb3
+	cmd:cython3
+	cmd:cythonize3
+"
+REQUIRES="
+	haiku
+	cmd:python3
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	python3_setuptools
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:make
+	cmd:python3
+"
+
+BUILD()
+{
+	$portPackageLinksDir/cmd~python3/bin/python3 setup.py build
+}
+
+INSTALL()
+{
+	# GENERIC: all python_setuptools-based installs need this
+	pythonVersion=$(python3 --version 2>&1 | sed 's/Python //' | head -c3)
+	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
+	export PYTHONPATH=$installLocation:$PYTHONPATH
+	mkdir -p $installLocation
+
+	$portPackageLinksDir/cmd~python3/bin/python3 setup.py install \
+		--prefix=$prefix --skip-build
+
+	for file in cygdb cython cythonize; \
+		do mv $binDir/$file $binDir/${file}3 ; \
+	done
+}
diff --git a/dev-python/cython/python_cython-0.25.2.recipe b/dev-python/cython/python_cython-0.25.2.recipe
new file mode 100644
index 000000000..9b3b5b8c7
--- /dev/null
+++ b/dev-python/cython/python_cython-0.25.2.recipe
@@ -0,0 +1,55 @@
+SUMMARY="Optimising static compiler for Python"
+DESCRIPTION="Cython is an optimising static compiler for both the Python \
+programming language and the extended Cython programming language (based on \
+Pyrex). It makes writing C extensions for Python as easy as Python itself."
+HOMEPAGE="http://cython.org/"
+COPYRIGHT="2007-2016 Stefan Behnel, Robert Bradshaw, et al."
+LICENSE="Apache v2"
+REVISION="1"
+SOURCE_URI="https://pypi.python.org/packages/b7/67/7e2a817f9e9c773ee3995c1e15204f5d01c8da71882016cac10342ef031b/Cython-0.25.2.tar.gz"
+CHECKSUM_SHA256="f141d1f9c27a07b5a93f7dc5339472067e2d7140d1c5a9e20112a5665ca60306"
+SOURCE_DIR="Cython-$portVersion"
+
+ARCHITECTURES="?x86_gcc2 x86 x86_64"
+
+PROVIDES="
+	python_cython = $portVersion
+	cmd:cygdb2
+	cmd:cython2
+	cmd:cythonize2
+"
+REQUIRES="
+	haiku
+	cmd:python2
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	python_setuptools
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:make
+	cmd:python2
+"
+
+BUILD()
+{
+	$portPackageLinksDir/cmd~python2/bin/python2 setup.py build
+}
+
+INSTALL()
+{
+	# GENERIC: all python_setuptools-based installs need this
+	pythonVersion=$(python2 --version 2>&1 | sed 's/Python //' | head -c3)
+	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
+	export PYTHONPATH=$installLocation:$PYTHONPATH
+	mkdir -p $installLocation
+
+	$portPackageLinksDir/cmd~python2/bin/python2 setup.py install \
+		--prefix=$prefix --skip-build
+
+	for file in cygdb cython cythonize; \
+		do mv $binDir/$file $binDir/${file}2 ; \
+	done
+}