diff --git a/devel/bison/patches/patch-lib_spawni.c b/devel/bison/patches/patch-zz-minix-a
similarity index 100%
rename from devel/bison/patches/patch-lib_spawni.c
rename to devel/bison/patches/patch-zz-minix-a
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 612b39f3e..960d68b88 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -124,7 +124,14 @@ PLIST.vis=		yes
 PTHREAD_AUTO_VARS=	yes
 .endif
 
+.if ${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix"
+CONFIGURE_ARGS+=	--disable-pthread-support
+.undef PLIST.hcrypto
+.endif
+
 .include "../../mk/termcap.buildlink3.mk"
+.if !(${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix")
 .include "../../mk/pthread.buildlink3.mk"
+.endif
 .include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/heimdal/distinfo b/security/heimdal/distinfo
index 7b6cee0d9..aa2ed5905 100644
--- a/security/heimdal/distinfo
+++ b/security/heimdal/distinfo
@@ -11,7 +11,9 @@ SHA1 (patch-cf_libtool.m4) = ffc6c28e13051976c8c25a0f1e486ba7d693facc
 SHA1 (patch-cf_pthreads.m4) = 2a9e065a5a602e1f437d1faaf82f864f45603b5d
 SHA1 (patch-cf_roken-frag.m4) = 599216f2650facaff0559f2a9cc27439e2f1f099
 SHA1 (patch-kdc_version-script.map) = bef9c33f2e4f4faa61771e2c462e43f1a56d0fb0
+SHA1 (patch-lib_ipc_common.c) = e8501c962f77bd98986b33fb8ed71312f7545bd4
 SHA1 (patch-lib_ipc_server.c) = fa806b549ed5cb3c4427e3865642e6d9555a59b0
+SHA1 (patch-lib_krb5_get__addrs.c) = c2353f8653b927a019a810e28b2ecb4f1eda8bfd
 SHA1 (patch-lib_libedit_aclocal.m4) = a556a5e2afab645263d3413422fc2e0a9825956b
 SHA1 (patch-lib_libedit_configure) = 54f92775849874b748e88e8f8923cc187cec5bae
 SHA1 (patch-lib_libedit_configure.ac) = 3c6122731b47cb94a488874b3e8d35f3a0bee3b1
@@ -19,3 +21,4 @@ SHA1 (patch-lib_libedit_src_unvis.c) = 117c91ead1ca94aaed38c2d0611588fec6746d61
 SHA1 (patch-lib_libedit_src_vis.c) = ade98e513187c3fa03194909409a9bb23f66509a
 SHA1 (patch-lib_otp_Makefile.in) = 8815c33a4eb024018a6160db58356704ec43d30c
 SHA1 (patch-lib_roken_vis.c) = 8037c4b36d6cd4bc2557a9409df04232276b7a28
+SHA1 (patch-zz-minix-a) = e55e06ff74b6fff8d6eacaf07001b18b178e672e
diff --git a/security/heimdal/patches/patch-lib_ipc_common.c b/security/heimdal/patches/patch-lib_ipc_common.c
new file mode 100644
index 000000000..645ff7c02
--- /dev/null
+++ b/security/heimdal/patches/patch-lib_ipc_common.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- lib/ipc/common.c.orig	Tue Jan 10 21:53:51 2012
++++ lib/ipc/common.c
+@@ -91,7 +91,7 @@ _heim_ipc_create_cred(uid_t uid, gid_t gid, pid_t pid,
+     return 0;
+ }
+ 
+-#ifndef HAVE_GCD
++#if !defined(HAVE_GCD) && defined(ENABLE_PTHREAD_SUPPORT)
+ struct heim_isemaphore {
+     HEIMDAL_MUTEX mutex;
+     pthread_cond_t cond;
diff --git a/security/heimdal/patches/patch-lib_krb5_get__addrs.c b/security/heimdal/patches/patch-lib_krb5_get__addrs.c
new file mode 100644
index 000000000..e7553f2d9
--- /dev/null
+++ b/security/heimdal/patches/patch-lib_krb5_get__addrs.c
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- lib/krb5/get_addrs.c.orig	Tue Jan 10 21:53:51 2012
++++ lib/krb5/get_addrs.c
+@@ -189,9 +189,11 @@ find_all_addresses (krb5_context context, krb5_address
+ 		continue;
+ 	    if (!krb5_sockaddr_is_loopback(ifa->ifa_addr))
+ 		continue;
++#ifdef IFF_LOOPBACK
+ 	    if ((ifa->ifa_flags & IFF_LOOPBACK) == 0)
+ 		/* Presumably loopback addrs are only used on loopback ifs! */
+ 		continue;
++#endif
+ 	    ret = krb5_sockaddr2address(context,
+ 					ifa->ifa_addr, &res->val[idx]);
+ 	    if (ret)
diff --git a/security/heimdal/patches/patch-zz-minix-a b/security/heimdal/patches/patch-zz-minix-a
new file mode 100644
index 000000000..00da471b4
--- /dev/null
+++ b/security/heimdal/patches/patch-zz-minix-a
@@ -0,0 +1,57 @@
+--- configure.orig	Fri Apr 24 21:20:55 2015
++++ configure	Fri Apr 24 21:27:45 2015
+@@ -5210,7 +5210,7 @@
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++  minix* | netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+     # This has been around since 386BSD, at least.  Likely further.
+     if test -x /sbin/sysctl; then
+       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+@@ -5702,7 +5702,7 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd*)
++minix* | netbsd*)
+   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+   else
+@@ -9130,7 +9130,7 @@
+       fi
+       ;;
+ 
+-    netbsd*)
++    minix* | netbsd*)
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+@@ -9763,7 +9763,7 @@
+       link_all_deplibs=yes
+       ;;
+ 
+-    netbsd*)
++    minix* | netbsd*)
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -10797,6 +10797,18 @@
+   # people can always --disable-shared, the test was removed, and we
+   # assume the GNU/Linux dynamic linker is in use.
+   dynamic_linker='GNU/Linux ld.so'
++  ;;
++
++minix*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  dynamic_linker='Minix ld.elf_so'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
+   ;;
+ 
+ netbsd*)