diff --git a/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild b/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild
index 6facd378531b1..8bfd1a2a39351 100644
--- a/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild
+++ b/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit distutils-r1
 
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="test? ( gmp )"
 
 python_prepare_all() {
-	epatch "${FILESDIR}"/${P}-cross-compile.patch
+	local PATCHES=( "${FILESDIR}"/${P}-cross-compile.patch )
 	# Fix Crypto.PublicKey.RSA._RSAobj.exportKey(format="OpenSSH") with Python 3
 	# https://github.com/dlitz/pycrypto/commit/ab25c6fe95ee92fac3187dcd90e0560ccacb084a
 	sed \
@@ -48,7 +48,7 @@ python_configure_all() {
 
 python_compile_all() {
 	if use doc; then
-		rst2html.py Doc/pycrypt.rst > Doc/index.html
+		rst2html.py Doc/pycrypt.rst > Doc/index.html || die
 		epydoc --config=Doc/epydoc-config --exclude-introspect="^Crypto\.(Random\.OSRNG\.nt|Util\.winrandom)$" || die
 	fi
 }