diff --git a/dev-python/iso8601/iso8601-0.1.12.recipe b/dev-python/iso8601/iso8601-0.1.12.recipe
index 114ca28d1..6fb8911a7 100644
--- a/dev-python/iso8601/iso8601-0.1.12.recipe
+++ b/dev-python/iso8601/iso8601-0.1.12.recipe
@@ -6,7 +6,7 @@ HOMEPAGE="https://pyiso8601.readthedocs.io/
 	https://pypi.org/project/iso8601/"
 COPYRIGHT="2007-2017 Michael Twomey"
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://files.pythonhosted.org/packages/source/i/iso8601/iso8601-$portVersion.tar.gz"
 CHECKSUM_SHA256="49c4b20e1f38aa5cf109ddcd39647ac419f928512c869dc01d5c7098eddede82"
 
@@ -21,31 +21,26 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku_devel
-	setuptools_python
-	setuptools_python3
-	"
-BUILD_PREREQUIRES="
-	cmd:python
-	cmd:python3
 	"
 
-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]}
-
-	eval "PROVIDES_$pythonPackage=\"
-		${portName}_$pythonPackage = $portVersion
-		\""
-	eval "REQUIRES_$pythonPackage=\"
-		haiku
-		cmd:python$pythonVersion
-		\""
-
-	TEST_REQUIRES+="
-		pytest_$pythonPackage
-		"
+pythonPackage=${PYTHON_PACKAGES[i]}
+pythonVersion=${PYTHON_VERSIONS[$i]}
+eval "PROVIDES_${pythonPackage}=\"\
+	${portName}_$pythonPackage = $portVersion\n\
+	cmd:pip$pythonVersion\n\
+	\"; \
+REQUIRES_$pythonPackage=\"\
+	haiku\n\
+	cmd:python$pythonVersion\n\
+	setuptools_$pythonPackage\n\
+	\""
+BUILD_REQUIRES="$BUILD_REQUIRES
+	setuptools_$pythonPackage"
+BUILD_PREREQUIRES="$BUILD_PREREQUIRES
+	cmd:python$pythonVersion"
 done
 
 BUILD()