diff --git a/dev-python/twisted/patches/twisted-17.1.0.patchset b/dev-python/twisted/patches/twisted-19.7.0.patchset
similarity index 100%
rename from dev-python/twisted/patches/twisted-17.1.0.patchset
rename to dev-python/twisted/patches/twisted-19.7.0.patchset
diff --git a/dev-python/twisted/twisted-17.1.0.recipe b/dev-python/twisted/twisted-19.7.0.recipe
similarity index 85%
rename from dev-python/twisted/twisted-17.1.0.recipe
rename to dev-python/twisted/twisted-19.7.0.recipe
index b70e26771..555ad4771 100644
--- a/dev-python/twisted/twisted-17.1.0.recipe
+++ b/dev-python/twisted/twisted-19.7.0.recipe
@@ -22,9 +22,9 @@ Twisted-based code."
 HOMEPAGE="https://twistedmatrix.com"
 COPYRIGHT="2001-2013 Twisted project members"
 LICENSE="MIT"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/twisted/twisted/archive/twisted-$portVersion.tar.gz"
-CHECKSUM_SHA256="47e31c594716989e88d6a440d15dbcb555cfb036a644fdddb9d35f32a50b1179"
+CHECKSUM_SHA256="c278ff18be0cffc6f1da0aa346d76366a5568eefb1728a885e20cc1bb385e52b"
 PATCHES="twisted-$portVersion.patchset"
 SOURCE_DIR="twisted-twisted-$portVersion"
 
@@ -43,8 +43,8 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:gcc
 	"
-PYTHON_PACKAGES=(python python3)
-PYTHON_VERSIONS=(2.7 3.6)
+PYTHON_PACKAGES=(python python36 python3)
+PYTHON_VERSIONS=(2.7 3.6 3.7)
 for i in "${!PYTHON_PACKAGES[@]}"; do
 pythonPackage=${PYTHON_PACKAGES[i]}
 pythonVersion=${PYTHON_VERSIONS[$i]}
@@ -76,9 +76,6 @@ PROVIDES_python="$PROVIDES_python
 	cmd:twist
 	cmd:twistd
 	"
-REPLACES_python="
-	python_twisted
-	"
 PROVIDES_python3="$PROVIDES_python3
 	cmd:cftp3
 	cmd:ckeygen3
@@ -93,6 +90,21 @@ PROVIDES_python3="$PROVIDES_python3
 	cmd:twist3
 	cmd:twistd3
 	"
+PROVIDES_python36="$PROVIDES_python36
+	cmd:cftp36
+	cmd:ckeygen36
+	cmd:conch36
+	cmd:mailmail36
+	cmd:manhole36
+	cmd:pyhtmlizer36
+	cmd:tap2deb36
+	cmd:tap2rpm36
+	cmd:tkconch36
+	cmd:trial36
+	cmd:twist36
+	cmd:twistd36
+	"
+
 INSTALL()
 {
 	for i in "${!PYTHON_PACKAGES[@]}"; do
@@ -107,11 +119,16 @@ INSTALL()
 		$python setup.py build install \
 			--root=/ --prefix=$prefix
 
-		if [ $pythonPackage != python ]; then
+		if [ $pythonPackage = python3 ]; then
 			for f in $binDir/*; do
 				mv $f ${f}3
 			done
 		fi
+		if [ $pythonPackage = python36 ]; then
+			for f in $binDir/*; do
+				mv $f ${f}36
+			done
+		fi
 
 		packageEntries  $pythonPackage \
 			$prefix/lib/python* \