diff --git a/dev-python/waitress/waitress-1.4.4.recipe b/dev-python/waitress/waitress-2.1.2.recipe
similarity index 65%
rename from dev-python/waitress/waitress-1.4.4.recipe
rename to dev-python/waitress/waitress-2.1.2.recipe
index 386b1df46..e0584acd6 100644
--- a/dev-python/waitress/waitress-1.4.4.recipe
+++ b/dev-python/waitress/waitress-2.1.2.recipe
@@ -9,12 +9,11 @@ COPYRIGHT="2011-2017 Pylons Project"
 LICENSE="ZPL v2.1"
 REVISION="1"
 SOURCE_URI="https://pypi.python.org/packages/source/w/waitress/waitress-$portVersion.tar.gz"
-CHECKSUM_SHA256="1bb436508a7487ac6cb097ae7a7fe5413aefca610550baf58f0940e51ecfb261"
+CHECKSUM_SHA256="780a4082c5fbc0fde6a2fcfe5e26e6efc1e8f425730863c04085769781f51eba"
 ARCHITECTURES="any"
 
 PROVIDES="
 	$portName = $portVersion
-	cmd:waitress_serve
 	"
 REQUIRES="
 	haiku
@@ -24,13 +23,14 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 
-PYTHON_PACKAGES=(python3 python38 python39)
-PYTHON_VERSIONS=(3.7 3.8 3.9)
+PYTHON_PACKAGES=(python3 python38 python39 python310)
+PYTHON_VERSIONS=(3.7 3.8 3.9 3.10)
 for i in "${!PYTHON_PACKAGES[@]}"; do
 pythonPackage=${PYTHON_PACKAGES[i]}
 pythonVersion=${PYTHON_VERSIONS[$i]}
 eval "PROVIDES_${pythonPackage}=\"\
-	${portName}_$pythonPackage = $portVersion\
+	${portName}_$pythonPackage = $portVersion\n\
+	cmd:waitress_serve$pythonVersion\n\
 	\"; \
 REQUIRES_$pythonPackage=\"\
 	haiku\n\
@@ -49,15 +49,22 @@ INSTALL()
 		pythonVersion=${PYTHON_VERSIONS[$i]}
 
 		python=python$pythonVersion
-		installLocation=$prefix/lib/$python/vendor-packages/
-		export PYTHONPATH=$installLocation:$PYTHONPATH
-		mkdir -p $installLocation
+		installLocation="$prefix"/lib/$python/vendor-packages/
+		export PYTHONPATH="$installLocation":$PYTHONPATH
+		mkdir -p "$installLocation"
 		rm -rf build
 		$python setup.py build install \
-			--root=/ --prefix=$prefix
+			--root=/ --prefix="$prefix"
+
+		mv "$prefix"/bin/waitress-serve "$prefix"/bin/waitress-serve$pythonVersion
+
+		install -m 755 -d "$docDir"
+		install -m 644 -t "$docDir" README.rst
 
 		packageEntries  $pythonPackage \
-			$prefix/lib/python*
+			"$prefix"/lib/$python \
+			"$prefix"/bin \
+			"$docDir"
 	done
 }