diff --git a/dev-python/setuptools/python3_setuptools-20.6.7.recipe b/dev-python/setuptools/python3_setuptools-22.0.0.recipe
similarity index 77%
rename from dev-python/setuptools/python3_setuptools-20.6.7.recipe
rename to dev-python/setuptools/python3_setuptools-22.0.0.recipe
index 793b0db95..0a89d3f9f 100644
--- a/dev-python/setuptools/python3_setuptools-20.6.7.recipe
+++ b/dev-python/setuptools/python3_setuptools-22.0.0.recipe
@@ -7,8 +7,9 @@ HOMEPAGE="https://pypi.python.org/pypi/setuptools"
 COPYRIGHT="2006-2014 Python Packaging Authority"
 LICENSE="Python"
 REVISION="1"
-SOURCE_URI="https://pypi.python.org/packages/source/s/setuptools/setuptools-$portVersion.zip"
-CHECKSUM_SHA256="7290abedfa47de40286b76b0206fbfd7c291ac51f0a62cc946af658967f77b8f"
+SOURCE_URI="https://github.com/pypa/setuptools/archive/v$portVersion.tar.gz"
+SOURCE_FILENAME="setuptools-$portVersion.tar.gz"
+CHECKSUM_SHA256="90a40d54d21d4cfe55ae2c3597ed3f2a63d9e8fe768f03ff16f2a58ed97bcc32"
 SOURCE_DIR="setuptools-$portVersion"
 
 ARCHITECTURES="x86 x86_gcc2 x86_64"
@@ -44,9 +45,4 @@ INSTALL()
 
 	$portPackageLinksDir/cmd~python3/bin/python3 setup.py install \
 		--prefix=$prefix
-
-	# easy_install cannot tolerate not being installed alongside setuptools,
-	# so just delete it.
-	rm $prefix/bin/easy_install
-	rm $prefix/bin/easy_install-3.?
 }
diff --git a/dev-python/setuptools/python_setuptools-20.7.0.recipe b/dev-python/setuptools/python_setuptools-22.0.0.recipe
similarity index 77%
rename from dev-python/setuptools/python_setuptools-20.7.0.recipe
rename to dev-python/setuptools/python_setuptools-22.0.0.recipe
index 74e9905f4..d0b74d0c0 100644
--- a/dev-python/setuptools/python_setuptools-20.7.0.recipe
+++ b/dev-python/setuptools/python_setuptools-22.0.0.recipe
@@ -7,8 +7,9 @@ HOMEPAGE="https://pypi.python.org/pypi/setuptools"
 COPYRIGHT="2006-2014 Python Packaging Authority"
 LICENSE="Python"
 REVISION="1"
-SOURCE_URI="https://pypi.python.org/packages/source/s/setuptools/setuptools-$portVersion.tar.gz"
-CHECKSUM_SHA256="505cdf282c5f6e3a056e79f0244b8945f3632257bba8469386c6b9b396400233"
+SOURCE_URI="https://github.com/pypa/setuptools/archive/v$portVersion.tar.gz"
+SOURCE_FILENAME="setuptools-$portVersion.tar.gz"
+CHECKSUM_SHA256="90a40d54d21d4cfe55ae2c3597ed3f2a63d9e8fe768f03ff16f2a58ed97bcc32"
 SOURCE_DIR="setuptools-$portVersion"
 
 ARCHITECTURES="x86 x86_gcc2 x86_64"
@@ -44,9 +45,4 @@ INSTALL()
 
 	$portPackageLinksDir/cmd~python2/bin/python2 setup.py install \
 		--prefix=$prefix
-
-	# easy_install cannot tolerate not being installed alongside setuptools,
-	# so just delete it.
-	rm $prefix/bin/easy_install
-	rm $prefix/bin/easy_install-2.?
 }