diff --git a/dev-python/pygments/pygments-1.6.recipe b/dev-python/pygments/pygments-2.1.3.recipe
similarity index 59%
rename from dev-python/pygments/pygments-1.6.recipe
rename to dev-python/pygments/pygments-2.1.3.recipe
index c6589149b..e3ab8ef7c 100644
--- a/dev-python/pygments/pygments-1.6.recipe
+++ b/dev-python/pygments/pygments-2.1.3.recipe
@@ -15,12 +15,11 @@ HOMEPAGE="http://pygments.org/"
 COPYRIGHT="2006-2013 by the Pygments team"
 LICENSE="BSD (2-clause)"
 REVISION="1"
-SOURCE_URI="https://pypi.python.org/packages/source/P/Pygments/Pygments-1.6.tar.gz"
-CHECKSUM_SHA256="799ed4caf77516e54440806d8d9cd82a7607dfdf4e4fb643815171a4b5c921c0"
-SOURCE_DIR="Pygments-1.6"
+SOURCE_URI="https://pypi.python.org/packages/source/P/Pygments/Pygments-$portVersion.tar.gz"
+CHECKSUM_SHA256="88e4c8a91b2af5962bfa5ea2447ec6dd357018e86e94c7d14bd8cacbc5b55d81"
+SOURCE_DIR="Pygments-$portVersion"
 
-ARCHITECTURES="x86 ?x86_gcc2"
-SECONDARY_ARCHITECTURES="x86 ?x86_gcc2"
+ARCHITECTURES="x86 x86_gcc2 x86_64"
 
 PROVIDES="
 	pygments$secondaryArchSuffix = $portVersion
@@ -28,23 +27,32 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	cmd:python$secondaryArchSuffix
+	cmd:python2$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	python_setuptools
 	"
 BUILD_PREREQUIRES="
-	cmd:python$secondaryArchSuffix
+	cmd:python2$secondaryArchSuffix
 	"
 
 BUILD()
 {
-	$portPackageLinksDir/cmd~python/bin/python setup.py build
+	$portPackageLinksDir/cmd~python2/bin/python2 setup.py build
 }
 
 INSTALL()
 {
-	$portPackageLinksDir/cmd~python/bin/python setup.py install \
-		--prefix=$prefix
+	# GENERIC: all python_setuptools-based installs need this
+	python=$portPackageLinksDir/cmd~python2/bin/python2
+	pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
+	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
+	export PYTHONPATH=$installLocation:$PYTHONPATH
+	mkdir -p $installLocation
+
+	$python setup.py install \
+		--single-version-externally-managed \
+		--root=/ --prefix=$prefix
 }