diff --git a/dev-python/docutils/docutils-0.15.2.recipe b/dev-python/docutils/docutils-0.16.recipe
similarity index 62%
rename from dev-python/docutils/docutils-0.15.2.recipe
rename to dev-python/docutils/docutils-0.16.recipe
index e0eace248..de2e6d9e1 100644
--- a/dev-python/docutils/docutils-0.15.2.recipe
+++ b/dev-python/docutils/docutils-0.16.recipe
@@ -12,8 +12,8 @@ LICENSE="Public Domain
 	GNU GPL v3
 	Python"
 REVISION="1"
-SOURCE_URI="https://files.pythonhosted.org/packages/93/22/953e071b589b0b1fee420ab06a0d15e5aa0c7470eb9966d60393ce58ad61/docutils-$portVersion.tar.gz"
-CHECKSUM_SHA256="a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99"
+SOURCE_URI="https://pypi.io/packages/source/${portName:0:1}/$portName/$portName-$portVersion.tar.gz"
+CHECKSUM_SHA256="c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc"
 
 ARCHITECTURES="any"
 
@@ -28,8 +28,8 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 
-PYTHON_PACKAGES=(python python3)
-PYTHON_VERSIONS=(2.7 3.7)
+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]}
@@ -76,6 +76,36 @@ PROVIDES_python3="$PROVIDES_python3
 	cmd:rst2xml3.py = $portVersion
 	cmd:rstpep2html3.py = $portVersion
 	"
+PROVIDES_python38="$PROVIDES_python38
+	cmd:rst2html38.py = $portVersion
+	cmd:rst2html438.py = $portVersion
+	cmd:rst2html538.py = $portVersion
+	cmd:rst2latex38.py = $portVersion
+	cmd:rst2man38.py = $portVersion
+	cmd:rst2newlatex38.py = $portVersion
+	cmd:rst2odt_prepstyles38.py = $portVersion
+	cmd:rst2odt38.py = $portVersion
+	cmd:rst2pseudoxml38.py = $portVersion
+	cmd:rst2s538.py = $portVersion
+	cmd:rst2xetex38.py = $portVersion
+	cmd:rst2xml38.py = $portVersion
+	cmd:rstpep2html38.py = $portVersion
+	"
+PROVIDES_python39="$PROVIDES_python39
+	cmd:rst2html39.py = $portVersion
+	cmd:rst2html439.py = $portVersion
+	cmd:rst2html539.py = $portVersion
+	cmd:rst2latex39.py = $portVersion
+	cmd:rst2man39.py = $portVersion
+	cmd:rst2newlatex39.py = $portVersion
+	cmd:rst2odt_prepstyles39.py = $portVersion
+	cmd:rst2odt39.py = $portVersion
+	cmd:rst2pseudoxml39.py = $portVersion
+	cmd:rst2s539.py = $portVersion
+	cmd:rst2xetex39.py = $portVersion
+	cmd:rst2xml39.py = $portVersion
+	cmd:rstpep2html39.py = $portVersion
+	"
 
 INSTALL()
 {
@@ -91,11 +121,21 @@ INSTALL()
 		$python setup.py build install \
 			--root=/ --prefix=$prefix
 
-		if [ $pythonPackage != python ]; then
+		if [ $pythonPackage == python3 ]; then
 			for f in $binDir/*.py; do
 				mv $f ${f%.py}3.py
 			done
 		fi
+		if [ $pythonPackage == python38 ]; then
+			for f in $binDir/*.py; do
+				mv $f ${f%.py}38.py
+			done
+		fi
+		if [ $pythonPackage == python39 ]; then
+			for f in $binDir/*.py; do
+				mv $f ${f%.py}39.py
+			done
+		fi
 		packageEntries  $pythonPackage \
 			$prefix/lib/python* \
 			$binDir