diff --git a/dev-python/pycrypto/pycrypto-2.6.1.recipe b/dev-python/pycrypto/pycrypto-2.6.1.recipe
index e0d3a44c5..ffb252d5b 100644
--- a/dev-python/pycrypto/pycrypto-2.6.1.recipe
+++ b/dev-python/pycrypto/pycrypto-2.6.1.recipe
@@ -4,10 +4,10 @@ This is a collection of both secure hash functions (such as SHA256 and
 RIPEMD160), and various encryption algorithms (AES, DES, RSA, ElGamal,
 etc.).
 "
-HOMEPAGE="http://pypi.python.org/pypi/pycrypto/2.6"
+HOMEPAGE="http://pypi.python.org/pypi/pycrypto/"
 LICENSE="pycrypto"
 COPYRIGHT="2010 Dwayne C. Litzenberger"
-REVISION="7"
+REVISION="8"
 SOURCE_URI="https://pypi.python.org/packages/source/p/pycrypto/pycrypto-$portVersion.tar.gz"
 CHECKSUM_SHA256="f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c"
 
@@ -29,47 +29,53 @@ BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:cc$secondaryArchSuffix
 	"
-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\
-	\"; \
-REQUIRES_$pythonPackage=\"\
-	haiku$secondaryArchSuffix\n\
-	lib:libgmp$secondaryArchSuffix\n\
-	cmd:python$pythonVersion\
-	\""
-if [ "$targetArchitecture" = "x86_gcc2" ]; then
-	eval "PROVIDES_${pythonPackage}+=\"\n\
-		pycrypto_$pythonPackage = $portVersion\
+
+PYTHON_VERSIONS=(3.10)
+
+for pythonVersion in ${PYTHON_VERSIONS[@]}; do
+	pythonPackage=python${pythonVersion//.}
+
+	eval "PROVIDES_$pythonPackage=\"
+		${portName}_$pythonPackage = $portVersion
 		\""
-fi
-BUILD_REQUIRES="$BUILD_REQUIRES
-	setuptools_$pythonPackage"
-BUILD_PREREQUIRES="$BUILD_PREREQUIRES
-	cmd:python$pythonVersion"
+	if [ "$targetArchitecture" = x86_gcc2 ]; then
+		eval "PROVIDES_$pythonPackage+=\"
+			pycrypto_$pythonPackage = $portVersion
+			\""
+	fi
+
+	eval "REQUIRES_$pythonPackage=\"
+		haiku$secondaryArchSuffix
+		lib:libgmp$secondaryArchSuffix
+		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
+
 		runConfigure ./configure
 		$python setup.py build
 		$python setup.py install \
 			--root=/ --prefix=$prefix
 
-		packageEntries  $pythonPackage \
+		packageEntries $pythonPackage \
 			$prefix/lib/python*
 	done
 }