diff --git a/dev-python/rdflib/rdflib-4.2.2.recipe b/dev-python/rdflib/rdflib-4.2.2.recipe
index 9103aa10d..918e0cb1e 100644
--- a/dev-python/rdflib/rdflib-4.2.2.recipe
+++ b/dev-python/rdflib/rdflib-4.2.2.recipe
@@ -5,11 +5,10 @@ HOMEPAGE="https://github.com/RDFLib/rdflib"
 COPYRIGHT="2002-2017 RDFLib Team"
 LICENSE="BSD (3-clause)"
 REVISION="1"
-SOURCE_URI="https://github.com/RDFLib/rdflib/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="a362926f77624a8abfb93042c28607f49445d003792d5271cd07f0610ab16033"
-SOURCE_FILENAME="rdflib-$portVersion.tar.gz"
+SOURCE_URI="https://pypi.io/packages/source/r/rdflib/rdflib-$portVersion.tar.gz"
+CHECKSUM_SHA256="da1df14552555c5c7715d8ce71c08f404c988c58a1ecd38552d0da4fc261280d"
 
-ARCHITECTURES="?any"
+ARCHITECTURES="any"
 
 PROVIDES="
 	rdflib = $portVersion
@@ -22,8 +21,8 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 
-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]}
@@ -53,7 +52,7 @@ for i in "${!PYTHON_PACKAGES[@]}"; do
 		setuptools_$pythonPackage"
 	BUILD_PREREQUIRES="$BUILD_PREREQUIRES
 		cmd:python$pythonVersion"
-	TEST_REQUIRES="TEST_REQUIRES
+	TEST_REQUIRES="$TEST_REQUIRES
 		nose_$pythonPackage"
 done
 
@@ -87,13 +86,15 @@ INSTALL()
 		$python setup.py install \
 			--root=/ --prefix="$prefix"
 
-		if [ "$pythonPackage" = python ]; then
+		maybeBinDir="$binDir"
+		if [ "$pythonPackage" != python3 ]; then
 			rm -rf "$binDir"
+			maybeBinDir=
 		fi
 
 		packageEntries $pythonPackage \
 			"$prefix"/lib/$python \
-			"$binDir"
+			$maybeBinDir
 	done
 }