diff --git a/dev-python/pynacl/pynacl-1.3.0.recipe b/dev-python/pynacl/pynacl-1.5.0.recipe
similarity index 67%
rename from dev-python/pynacl/pynacl-1.3.0.recipe
rename to dev-python/pynacl/pynacl-1.5.0.recipe
index 44134663b..53c79871b 100644
--- a/dev-python/pynacl/pynacl-1.3.0.recipe
+++ b/dev-python/pynacl/pynacl-1.5.0.recipe
@@ -5,33 +5,33 @@ COPYRIGHT="2013,2018 Donald Stufft and individual contributors"
 LICENSE="Apache v2"
 REVISION="1"
 SOURCE_URI="https://pypi.io/packages/source/p/pynacl/PyNaCl-$portVersion.tar.gz"
-CHECKSUM_SHA256="0c6100edd16fefd1557da078c7a31e7b7d7a52ce39fdca2bec29d4f7b6e7600c"
+CHECKSUM_SHA256="8ac7448f09ab85811607bdd21ec2464495ac8b7c66d146bf545b0f08fb9220ba"
 SOURCE_DIR="PyNaCl-$portVersion"
 
-ARCHITECTURES="all !x86_gcc2 ?x86"
-SECONDARY_ARCHITECTURES="?x86"
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	$portName = $portVersion
 	"
 REQUIRES="
-	haiku
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
+	haiku${secondaryArchSuffix}_devel
 	devel:libsodium$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:cmp
 	cmd:diff
-	gcc$secondaryArchSuffix
+	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	"
 
-PYTHON_PACKAGES=(python python3)
-PYTHON_VERSIONS=(2.7 3.7)
+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]}
@@ -40,11 +40,18 @@ eval "PROVIDES_${pythonPackage}=\"\
 	\"; \
 REQUIRES_$pythonPackage=\"\
 	haiku\n\
+	cffi${secondaryArchSuffix}_$pythonPackage\n\
 	six_$pythonPackage\n\
-	cmd:python$pythonVersion\
+	cmd:python$pythonVersion\n\
+	lib:libsodium$secondaryArchSuffix\
 	\""
+if [ "$targetArchitecture" = "x86_gcc2" ]; then
+	eval "PROVIDES_${pythonPackage}+=\"\n\
+		pynacl_$pythonPackage = $portVersion\
+		\""
+fi
 BUILD_REQUIRES="$BUILD_REQUIRES
-	cffi_$pythonPackage
+	cffi${secondaryArchSuffix}_$pythonPackage
 	setuptools_$pythonPackage"
 BUILD_PREREQUIRES="$BUILD_PREREQUIRES
 	cmd:python$pythonVersion"
@@ -65,7 +72,11 @@ INSTALL()
 		$python setup.py build install \
 			--root=/ --prefix=$prefix
 
+		install -m 755 -d "$docDir"
+		install -m 644 -t "$docDir" README.rst
+
 		packageEntries  $pythonPackage \
 			$prefix/lib/python*
 	done
 }
+