diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index ad2c0a923..f8ef070f9 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -31,6 +31,11 @@ CONFIGURE_ARGS+=	--install_prefix=${DESTDIR}
 CONFIGURE_ARGS+=	--openssldir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	shared no-fips
 
+.if ${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix"
+CONFIGURE_SCRIPT=      ./Configure
+CONFIGURE_ARGS+=       Minix no-threads
+.endif
+
 .if ${OPSYS} == "SunOS"
 .  if ${MACHINE_ARCH} == "sparc"
 OPENSSL_MACHINE_ARCH=	${SPARC_TARGET_ARCH}
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index eac4dfc36..dd8fdd9e9 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -12,3 +12,5 @@ SHA1 (patch-crypto_bn_bn__prime.pl) = c07e8ccba319e4260af46e714c3be56f70579fa6
 SHA1 (patch-crypto_des_Makefile) = 6c67c81ba7054647e1138165d9280c8db82b8498
 SHA1 (patch-engines_ccgost_Makefile) = 8834074c74abab604ef1ba7959750c22c0ffb6e7
 SHA1 (patch-tools_Makefile) = 6e7324d01c0cd5e290085fe8124315bcac8cf198
+SHA1 (patch-zz-minix-a) = eea835946ed13192a93146354805f3be8e00c935
+SHA1 (patch-zz-minix-b) = e88a0cf7c3f60b54e46e2323c85eafdb8678fb06
diff --git a/security/openssl/patches/patch-zz-minix-a b/security/openssl/patches/patch-zz-minix-a
new file mode 100644
index 000000000..6b98b1bf4
--- /dev/null
+++ b/security/openssl/patches/patch-zz-minix-a
@@ -0,0 +1,14 @@
+--- e_os.h.orig	Thu Mar 19 13:30:36 2015
++++ e_os.h	Fri Apr 24 14:51:53 2015
+@@ -82,7 +82,11 @@
+  * set this to a comma-separated list of 'random' device files to try out. My
+  * default, we will try to read at least one of these files
+  */
++#if defined(__minix)
++#  define DEVRANDOM "/dev/random","/dev/urandom","/dev/srandom"
++#else
+ #  define DEVRANDOM "/dev/urandom","/dev/random","/dev/srandom"
++#endif /* defined(__minix) */
+ # endif
+ # ifndef DEVRANDOM_EGD
+ /*
diff --git a/security/openssl/patches/patch-zz-minix-b b/security/openssl/patches/patch-zz-minix-b
new file mode 100644
index 000000000..ce487eb4e
--- /dev/null
+++ b/security/openssl/patches/patch-zz-minix-b
@@ -0,0 +1,11 @@
+--- Configure.orig	Sun Aug 30 20:55:24 2015
++++ Configure	Sun Aug 30 20:59:27 2015
+@@ -482,6 +482,8 @@
+ "BSD-ia64",	"gcc:-DL_ENDIAN -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "BSD-x86_64",	"cc:-DL_ENDIAN -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ 
++"Minix", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall -DNO_SYSLOG -DNO_TIMEB::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++
+ "NetBSD","gcc:-DTERMIOS -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "NetBSD-alpha", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "NetBSD-arm", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",