diff --git a/dev-python/paramiko/paramiko-1.18.2.recipe b/dev-python/paramiko/paramiko-2.6.0.recipe
similarity index 67%
rename from dev-python/paramiko/paramiko-1.18.2.recipe
rename to dev-python/paramiko/paramiko-2.6.0.recipe
index 213ddb397..59b52027c 100644
--- a/dev-python/paramiko/paramiko-1.18.2.recipe
+++ b/dev-python/paramiko/paramiko-2.6.0.recipe
@@ -5,9 +5,9 @@ remote machines."
 HOMEPAGE="https://www.lag.net/paramiko/"
 COPYRIGHT="2003-2009  Robey Pointer"
 LICENSE="GNU LGPL v2.1"
-REVISION="2"
-SOURCE_URI="https://github.com/paramiko/paramiko/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="79bf1702ec9e0b556cbfb3e68c19091f66d98b787c6deede82c48281a6e87f36"
+REVISION="1"
+SOURCE_URI="https://pypi.io/packages/source/p/paramiko/paramiko-$portVersion.tar.gz"
+CHECKSUM_SHA256="f4b2edfa0d226b70bd4ca31ea7e389325990283da23465d572ed1f70a7583041"
 
 ARCHITECTURES="any"
 
@@ -21,9 +21,11 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku_devel
 	"
-
-PYTHON_PACKAGES=(python python3)
-PYTHON_VERSIONS=(2.7 3.6)
+TEST_REQUIRES="
+	pytest
+	"
+PYTHON_PACKAGES=(python python36 python3)
+PYTHON_VERSIONS=(2.7 3.6 3.7)
 for i in "${!PYTHON_PACKAGES[@]}"; do
 pythonPackage=${PYTHON_PACKAGES[i]}
 pythonVersion=${PYTHON_VERSIONS[$i]}
@@ -32,19 +34,20 @@ eval "PROVIDES_${pythonPackage}=\"\
 	\"; \
 REQUIRES_$pythonPackage=\"\
 	haiku\n\
-	pycrypto_$pythonPackage\n\
+	bcrypt_$pythonPackage >= 3.1.3\n\
+	cryptography_$pythonPackage\n\
+	pynacl_$pythonPackage >= 1.0.1\n\
 	cmd:python$pythonVersion\
 	\""
 BUILD_REQUIRES="$BUILD_REQUIRES
 	setuptools_$pythonPackage
-	pycrypto_$pythonPackage"
+	"
 BUILD_PREREQUIRES="$BUILD_PREREQUIRES
 	cmd:python$pythonVersion"
-done
-
-REPLACES_python="
-	python_paramiko
+TEST_REQUIRES="$TEST_REQUIRES
+	pytest_$pythonPackage
 	"
+done
 
 INSTALL()
 {
@@ -64,3 +67,14 @@ INSTALL()
 			$prefix/lib/python*
 	done
 }
+
+TEST()
+{
+	for i in "${!PYTHON_PACKAGES[@]}"; do
+		pythonPackage=${PYTHON_PACKAGES[i]}
+		pythonVersion=${PYTHON_VERSIONS[$i]}
+
+		python=python$pythonVersion
+		pytest
+	done
+}