diff --git a/dev-python/twisted/patches/python_twisted-13.2.0.patchset b/dev-python/twisted/patches/python_twisted-16.1.1.patchset
similarity index 89%
rename from dev-python/twisted/patches/python_twisted-13.2.0.patchset
rename to dev-python/twisted/patches/python_twisted-16.1.1.patchset
index 1485bddfd..32296ecd5 100644
--- a/dev-python/twisted/patches/python_twisted-13.2.0.patchset
+++ b/dev-python/twisted/patches/python_twisted-16.1.1.patchset
@@ -1,13 +1,13 @@
-From 74c88f321a48ca64852eb22200712fc97eb2af33 Mon Sep 17 00:00:00 2001
+From 2ee4b9c1ba7fe6a62bdb963842741bd013e8c4bd Mon Sep 17 00:00:00 2001
 From: Jessica Hamilton <jessica.l.hamilton@gmail.com>
 Date: Fri, 20 Jun 2014 04:57:11 +0000
 Subject: sendmsg.c: fix compiling with gcc2.
 
 
-diff --git a/twisted/python/sendmsg.c b/twisted/python/sendmsg.c
-index 9f2fd8c..265003a 100644
---- a/twisted/python/sendmsg.c
-+++ b/twisted/python/sendmsg.c
+diff --git a/twisted/python/_sendmsg.c b/twisted/python/_sendmsg.c
+index 3f05501..e4d6600 100644
+--- a/twisted/python/_sendmsg.c
++++ b/twisted/python/_sendmsg.c
 @@ -175,9 +175,11 @@ static PyObject *sendmsg_sendmsg(PyObject *self, PyObject *args, PyObject *keywd
  
      int fd;
@@ -55,5 +55,5 @@ index 9f2fd8c..265003a 100644
          PyErr_SetFromErrno(sendmsg_socket_error);
          return NULL;
 -- 
-1.8.3.4
+2.2.2
 
diff --git a/dev-python/twisted/python_twisted-13.2.0.recipe b/dev-python/twisted/python_twisted-16.1.1.recipe
similarity index 69%
rename from dev-python/twisted/python_twisted-13.2.0.recipe
rename to dev-python/twisted/python_twisted-16.1.1.recipe
index 78689b86b..3bbb1f1c9 100644
--- a/dev-python/twisted/python_twisted-13.2.0.recipe
+++ b/dev-python/twisted/python_twisted-16.1.1.recipe
@@ -22,10 +22,10 @@ Twisted-based code."
 HOMEPAGE="http://twistedmatrix.com"
 COPYRIGHT="2001-2013 Twisted project members"
 LICENSE="MIT"
-REVISION="2"
-SOURCE_URI="https://twistedmatrix.com/Releases/Twisted/13.2/Twisted-13.2.0.tar.bz2"
-CHECKSUM_SHA256="095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3"
-PATCHES="python_twisted-13.2.0.patchset"
+REVISION="1"
+SOURCE_URI="https://pypi.python.org/packages/source/T/Twisted/Twisted-$portVersion.tar.bz2"
+CHECKSUM_SHA256="fe7d001d9a803ed26cd0fd2f69fa4212ff025f3af6ef1a559d905fe551ab04e9"
+PATCHES="python_twisted-$portVersion.patchset"
 SOURCE_DIR="Twisted-$portVersion"
 
 ARCHITECTURES="x86 x86_gcc2 x86_64"
@@ -49,25 +49,34 @@ PROVIDES="
 REQUIRES="
 	haiku
 	python_zope.interface >= 3.6.0
-	cmd:python
+	cmd:python2
 	"
 
 BUILD_REQUIRES="
 	haiku_devel
+	python_setuptools
 	python_zope.interface >= 3.6.0
 	"
 BUILD_PREREQUIRES="
-	cmd:python
+	cmd:python2
 	cmd:gcc
 	"
 
 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
 }