diff --git a/security/py-OpenSSL/Makefile b/security/py-OpenSSL/Makefile
index aee08ae6756e1..176b49851f57c 100644
--- a/security/py-OpenSSL/Makefile
+++ b/security/py-OpenSSL/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.39 2016/06/08 17:43:38 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2017/01/28 12:09:14 wiz Exp $
 
-DISTNAME=	pyOpenSSL-16.0.0
+DISTNAME=	pyOpenSSL-16.2.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
 CATEGORIES=	security python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyOpenSSL/}
@@ -12,6 +12,8 @@ LICENSE=	apache-2.0
 
 DEPENDS+=	${PYPKGPREFIX}-cryptography>=0.3:../../security/py-cryptography
 DEPENDS+=	${PYPKGPREFIX}-six>=1.5.2:../../lang/py-six
+# TEST_DEPENDS
+BUILD_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
 .include "../../lang/python/egg.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/security/py-OpenSSL/distinfo b/security/py-OpenSSL/distinfo
index 6297af88ec6a0..89267f4dfe76b 100644
--- a/security/py-OpenSSL/distinfo
+++ b/security/py-OpenSSL/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.12 2016/04/20 16:05:57 leot Exp $
+$NetBSD: distinfo,v 1.13 2017/01/28 12:09:14 wiz Exp $
 
-SHA1 (pyOpenSSL-16.0.0.tar.gz) = 4efb8f880743acf48070d3adaf9f0bce5601e6a8
-RMD160 (pyOpenSSL-16.0.0.tar.gz) = 5743ac77e6accd99ce645adbfff559ba379f94b7
-SHA512 (pyOpenSSL-16.0.0.tar.gz) = ba67a34e04e383ab42b619c5d9e73206672d584b0795e1d09c5de7e624bff0e3bd9f9e69d51a92d6a40e4000408ae21d5d2ac281f22aeca2e8681e6fa762a081
-Size (pyOpenSSL-16.0.0.tar.gz) = 171929 bytes
+SHA1 (pyOpenSSL-16.2.0.tar.gz) = ee0beabb001369d5fbb91ef71276cad73b3df21d
+RMD160 (pyOpenSSL-16.2.0.tar.gz) = de7809b08f9a3cef806784ec366000f4d044dc81
+SHA512 (pyOpenSSL-16.2.0.tar.gz) = c1b068137a492564fe958603712d401b7ee0def94c01a28be55f5c89e07c25684ecb0f465f3c56f35924bde038894f2914ac49539144845fb586d12b80307078
+Size (pyOpenSSL-16.2.0.tar.gz) = 167305 bytes
+SHA1 (patch-tests_memdbg.py) = 5ae8ea838363e1a9ee434c5c7dd39f5ba58471b2
diff --git a/security/py-OpenSSL/patches/patch-tests_memdbg.py b/security/py-OpenSSL/patches/patch-tests_memdbg.py
new file mode 100644
index 0000000000000..fb8c82f6e8d8f
--- /dev/null
+++ b/security/py-OpenSSL/patches/patch-tests_memdbg.py
@@ -0,0 +1,29 @@
+$NetBSD: patch-tests_memdbg.py,v 1.1 2017/01/28 12:09:14 wiz Exp $
+
+Fix running test on NetBSD.
+Breaks Linux, but I expect more people to run the tests on NetBSD.
+https://github.com/pyca/pyopenssl/issues/595
+
+--- tests/memdbg.py.orig	2016-02-15 10:25:58.000000000 +0000
++++ tests/memdbg.py
+@@ -18,16 +18,16 @@ _ffi.cdef(
+ 
+     int  CRYPTO_set_mem_functions(void *(*m)(size_t),void *(*r)(void *,size_t), void (*f)(void *));
+ 
+-    int backtrace(void **buffer, int size);
+-    char **backtrace_symbols(void *const *buffer, int size);
+-    void backtrace_symbols_fd(void *const *buffer, int size, int fd);
++    size_t backtrace(void **buffer, size_t size);
++    char **backtrace_symbols(void *const *buffer, size_t size);
++    void backtrace_symbols_fd(void *const *buffer, size_t size, int fd);
+     """)  # noqa
+ _api = _ffi.verify(
+     """
+     #include <openssl/crypto.h>
+     #include <stdlib.h>
+     #include <execinfo.h>
+-    """, libraries=["crypto"])
++    """, libraries=["crypto", "execinfo"])
+ C = _ffi.dlopen(None)
+ 
+ verbose = False