diff --git a/dev-python/setuptools/python_setuptools-5.3.recipe b/dev-python/setuptools/python_setuptools-20.7.0.recipe
similarity index 76%
rename from dev-python/setuptools/python_setuptools-5.3.recipe
rename to dev-python/setuptools/python_setuptools-20.7.0.recipe
index 2b144a4ca..74e9905f4 100644
--- a/dev-python/setuptools/python_setuptools-5.3.recipe
+++ b/dev-python/setuptools/python_setuptools-20.7.0.recipe
@@ -6,9 +6,9 @@ Perl and PHP, respectively."
 HOMEPAGE="https://pypi.python.org/pypi/setuptools"
 COPYRIGHT="2006-2014 Python Packaging Authority"
 LICENSE="Python"
-REVISION="2"
-SOURCE_URI="https://pypi.python.org/packages/source/s/setuptools/setuptools-5.3.zip"
-CHECKSUM_SHA256="238142293c36d2b56c83df1886b4c1fc4af77d0c203c68b8f4e57d8995babfe5"
+REVISION="1"
+SOURCE_URI="https://pypi.python.org/packages/source/s/setuptools/setuptools-$portVersion.tar.gz"
+CHECKSUM_SHA256="505cdf282c5f6e3a056e79f0244b8945f3632257bba8469386c6b9b396400233"
 SOURCE_DIR="setuptools-$portVersion"
 
 ARCHITECTURES="x86 x86_gcc2 x86_64"
@@ -18,31 +18,31 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku
-	cmd:python
+	cmd:python2
 	"
 
 BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:python
+	cmd:python2
 	cmd:sed
 	"
 
 BUILD()
 {
-	$portPackageLinksDir/cmd~python/bin/python setup.py build
+	$portPackageLinksDir/cmd~python2/bin/python2 setup.py build
 }
 
 INSTALL()
 {
 	# GENERIC: all python_setuptools-based installs need this
-	pythonVersion=$(python --version 2>&1 | sed 's/Python //' | head -c3)
+	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~python/bin/python setup.py install \
+	$portPackageLinksDir/cmd~python2/bin/python2 setup.py install \
 		--prefix=$prefix
 
 	# easy_install cannot tolerate not being installed alongside setuptools,