diff --git a/dev-python/waitress/waitress-2.1.2.recipe b/dev-python/waitress/waitress-2.1.2.recipe
index 00f458aca..e0dd4cced 100644
--- a/dev-python/waitress/waitress-2.1.2.recipe
+++ b/dev-python/waitress/waitress-2.1.2.recipe
@@ -7,8 +7,8 @@ It supports HTTP/1.0 and HTTP/1.1."
 HOMEPAGE="https://pypi.org/project/waitress/"
 COPYRIGHT="2011-2017 Pylons Project"
 LICENSE="ZPL v2.1"
-REVISION="3"
-SOURCE_URI="https://pypi.python.org/packages/source/w/waitress/waitress-$portVersion.tar.gz"
+REVISION="4"
+SOURCE_URI="https://files.pythonhosted.org/packages/source/w/waitress/waitress-$portVersion.tar.gz"
 CHECKSUM_SHA256="780a4082c5fbc0fde6a2fcfe5e26e6efc1e8f425730863c04085769781f51eba"
 ARCHITECTURES="any"
 
@@ -23,48 +23,69 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 
-PYTHON_PACKAGES=(python39 python310)
-PYTHON_VERSIONS=(3.9 3.10)
-for i in "${!PYTHON_PACKAGES[@]}"; do
-pythonPackage=${PYTHON_PACKAGES[i]}
-pythonVersion=${PYTHON_VERSIONS[$i]}
-eval "PROVIDES_${pythonPackage}=\"\
-	${portName}_$pythonPackage = $portVersion\n\
-	cmd:waitress_serve$pythonVersion\n\
-	\"; \
-REQUIRES_$pythonPackage=\"\
-	haiku\n\
-	cmd:python$pythonVersion\
-	\""
-BUILD_REQUIRES="$BUILD_REQUIRES
-	setuptools_$pythonPackage"
-BUILD_PREREQUIRES="$BUILD_PREREQUIRES
-	cmd:python$pythonVersion"
+PYTHON_VERSIONS=(3.10)
+defaultVersion=3.10
+
+for pythonVersion in ${PYTHON_VERSIONS[@]}; do
+	pythonPackage=python${pythonVersion//.}
+
+	eval "PROVIDES_$pythonPackage=\"
+		${portName}_$pythonPackage = $portVersion
+		cmd:waitress_serve_$pythonVersion = $portVersion
+		\""
+	# Provide non-suffixed cmd only for the default Python version
+	if [ $pythonVersion = $defaultVersion ]; then
+		eval "PROVIDES_$pythonPackage+=\"
+			cmd:waitress_serve = $portVersion
+			\""
+	fi
+
+	eval "REQUIRES_$pythonPackage=\"
+		haiku
+		cmd:python$pythonVersion
+		\""
+
+	BUILD_REQUIRES+="
+		setuptools_$pythonPackage
+		"
+	BUILD_PREREQUIRES+="
+		cmd:python$pythonVersion
+		"
 done
 
 INSTALL()
 {
-	for i in "${!PYTHON_PACKAGES[@]}"; do
-		pythonPackage=${PYTHON_PACKAGES[i]}
-		pythonVersion=${PYTHON_VERSIONS[$i]}
+	for pythonVersion in ${PYTHON_VERSIONS[@]}; do
+		pythonPackage=python${pythonVersion//.}
 
 		python=python$pythonVersion
 		installLocation="$prefix"/lib/$python/vendor-packages/
 		export PYTHONPATH="$installLocation":$PYTHONPATH
+
 		mkdir -p "$installLocation"
 		rm -rf build
+
 		$python setup.py build install \
 			--root=/ --prefix="$prefix"
 
-		mv "$prefix"/bin/waitress-serve "$prefix"/bin/waitress-serve$pythonVersion
+		# Version suffix all the scripts
+		for f in $binDir/*; do
+			mv $f $f-$pythonVersion
+		done
+
+		# And provide suffix-less symlinks for the default version
+		if [ $pythonVersion = $defaultVersion ]; then
+			for f in $binDir/*; do
+				ln -sr $f ${f%-$pythonVersion}
+			done
+		fi
 
 		install -m 755 -d "$docDir"
 		install -m 644 -t "$docDir" README.rst
 
-		packageEntries  $pythonPackage \
+		packageEntries $pythonPackage \
 			"$prefix"/lib/$python \
 			"$prefix"/bin \
 			"$docDir"
 	done
 }
-