diff --git a/dev-python/pyrfc3339/pyrfc3339-1.1.recipe b/dev-python/pyrfc3339/pyrfc3339-1.1.recipe
index 809bb999a..0affc617c 100644
--- a/dev-python/pyrfc3339/pyrfc3339-1.1.recipe
+++ b/dev-python/pyrfc3339/pyrfc3339-1.1.recipe
@@ -5,8 +5,8 @@ HOMEPAGE="https://github.com/kurtraschke/pyRFC3339
 	https://pypi.org/project/pyRFC3339/"
 COPYRIGHT="2011-2018 Kurt Raschke"
 LICENSE="MIT"
-REVISION="1"
-SOURCE_URI="https://files.pythonhosted.org/packages/source/p/pyRFC3339/pyRFC3339-$portVersion.tar.gz"
+REVISION="2"
+SOURCE_URI="https://pypi.io/packages/source/p/pyRFC3339/pyRFC3339-$portVersion.tar.gz"
 CHECKSUM_SHA256="81b8cbe1519cdb79bed04910dd6fa4e181faf8c88dff1e1b987b5f7ab23a5b1a"
 SOURCE_DIR="pyRFC3339-$portVersion"
 
@@ -21,68 +21,42 @@ 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 python3 python38 python39)
+PYTHON_VERSIONS=(2.7 3.7 3.8 3.9)
 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
-		pytz_$pythonPackage
-		\""
-
-	BUILD_REQUIRES+="
-		pytz_$pythonPackage
-		"
+pythonPackage=${PYTHON_PACKAGES[i]}
+pythonVersion=${PYTHON_VERSIONS[$i]}
+eval "PROVIDES_${pythonPackage}=\"\
+	${portName}_$pythonPackage = $portVersion\
+	\"; \
+REQUIRES_$pythonPackage=\"\
+	haiku\n\
+	cmd:python$pythonVersion\n\
+	pytz_$pythonPackage\
+	\""
+BUILD_REQUIRES="$BUILD_REQUIRES
+	setuptools_$pythonPackage"
+BUILD_PREREQUIRES="$BUILD_PREREQUIRES
+	cmd:python$pythonVersion"
 done
 
-BUILD()
-{
-	for i in "${!PYTHON_PACKAGES[@]}"; do
-		pythonPackage=${PYTHON_PACKAGES[i]}
-		pythonVersion=${PYTHON_VERSIONS[$i]}
-
-		rm -rf "$sourceDir"-$pythonPackage
-		cp -a "$sourceDir" "$sourceDir"-$pythonPackage
-		cd "$sourceDir"-$pythonPackage
-
-		python=python$pythonVersion
-		$python setup.py build
-	done
-}
-
 INSTALL()
 {
 	for i in "${!PYTHON_PACKAGES[@]}"; do
 		pythonPackage=${PYTHON_PACKAGES[i]}
 		pythonVersion=${PYTHON_VERSIONS[$i]}
 
-		cd "$sourceDir"-$pythonPackage
-
 		python=python$pythonVersion
 		installLocation=$prefix/lib/$python/vendor-packages/
-		export PYTHONPATH=$installLocation
-		mkdir -p "$installLocation"
-		$python setup.py install \
-			--root=/ --prefix="$prefix"
+		export PYTHONPATH=$installLocation:$PYTHONPATH
+		mkdir -p $installLocation
+		rm -rf build
+		$python setup.py build install \
+			--root=/ --prefix=$prefix
 
-		packageEntries $pythonPackage \
-			"$prefix"/lib/$python
+		packageEntries  $pythonPackage \
+			$prefix/lib/python*
 	done
-
-	install -m 755 -d "$docDir"
-	install -m 644 -t "$docDir" README.rst
 }