diff --git a/security/py-twistedConch/Makefile b/security/py-twistedConch/Makefile
index 7d2c1387c8c0..db8c3884da02 100644
--- a/security/py-twistedConch/Makefile
+++ b/security/py-twistedConch/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	twistedConch
-PORTVERSION=	11.0.0
-PORTREVISION=	1
+PORTVERSION=	12.0.0
 CATEGORIES=	security devel python
 MASTER_SITES=	http://twistedmatrix.com/Releases/Conch/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	TwistedConch-${PORTVERSION}
 
-MAINTAINER=	neal@nelson.name
+MAINTAINER=	python@FreeBSD.org
 COMMENT=	An SSH and SFTP protocol implementation with clients and servers
 
 LICENSE=	MIT
@@ -21,8 +20,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/twisted:${PORTSDIR}/devel/py-twistedCore
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/twisted:${PORTSDIR}/devel/py-twistedCore \
-		${PYTHON_PKGNAMEPREFIX}asn1>=0.0.9a:${PORTSDIR}/devel/py-asn1 \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:${PORTSDIR}/security/py-pycrypto
+		${PYTHON_PKGNAMEPREFIX}asn1>=0.0.9a:${PORTSDIR}/devel/py-asn1
 
 USE_BZIP2=	yes
 USE_PYTHON=	yes
diff --git a/security/py-twistedConch/distinfo b/security/py-twistedConch/distinfo
index 94ca9c56a261..1f57089a9008 100644
--- a/security/py-twistedConch/distinfo
+++ b/security/py-twistedConch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (TwistedConch-11.0.0.tar.bz2) = a3bd009928b8388928b24fbbb29e1dae6ea092f3a378001f426c6f6302f25504
-SIZE (TwistedConch-11.0.0.tar.bz2) = 209673
+SHA256 (TwistedConch-12.0.0.tar.bz2) = b66249b32186eb3bc82ef3d2be4165809a625e57aabc4797c4f5cd134d883595
+SIZE (TwistedConch-12.0.0.tar.bz2) = 214365
diff --git a/security/py-twistedConch/pkg-plist b/security/py-twistedConch/pkg-plist
index 6b26ff0b69d3..7baa26a13c14 100644
--- a/security/py-twistedConch/pkg-plist
+++ b/security/py-twistedConch/pkg-plist
@@ -173,12 +173,18 @@ bin/tkconch
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_checkers.py
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_checkers.pyc
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_checkers.pyo
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_ckeygen.py
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_ckeygen.pyc
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_ckeygen.pyo
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_conch.py
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_conch.pyc
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_conch.pyo
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_connection.py
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_connection.pyc
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_connection.pyo
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_default.py
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_default.pyc
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_default.pyo
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_filetransfer.py
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_filetransfer.pyc
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_filetransfer.pyo
@@ -206,9 +212,18 @@ bin/tkconch
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_recvline.py
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_recvline.pyc
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_recvline.pyo
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_scripts.py
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_scripts.pyc
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_scripts.pyo
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_session.py
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_session.pyc
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_session.pyo
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_ssh.py
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_ssh.pyc
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_ssh.pyo
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_tap.py
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_tap.pyc
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_tap.pyo
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_telnet.py
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_telnet.pyc
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_telnet.pyo
@@ -224,18 +239,6 @@ bin/tkconch
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_window.py
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_window.pyc
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_window.pyo
-%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_default.py
-%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_ckeygen.py
-%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_tap.py
-%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_session.py
-%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_default.pyc
-%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_ckeygen.pyc
-%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_tap.pyc
-%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_session.pyc
-%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_default.pyo
-%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_ckeygen.pyo
-%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_tap.pyo
-%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_session.pyo
 %%PYTHON_SITELIBDIR%%/twisted/conch/ttymodes.py
 %%PYTHON_SITELIBDIR%%/twisted/conch/ttymodes.pyc
 %%PYTHON_SITELIBDIR%%/twisted/conch/ttymodes.pyo
@@ -263,3 +266,4 @@ bin/tkconch
 @dirrm %%PYTHON_SITELIBDIR%%/twisted/conch/insults
 @dirrm %%PYTHON_SITELIBDIR%%/twisted/conch/client
 @dirrm %%PYTHON_SITELIBDIR%%/twisted/conch
+@dirrmtry %%PYTHON_SITELIBDIR%%/twisted