diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 119a1c9b5..5378de740 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -114,6 +114,11 @@ CONFIGURE_ENV+=		ac_cv_func_strnvis=no
 # workaround for ./configure problem, pkg/50936
 #
 CONFIGURE_ENV+=		ac_cv_func_reallocarray=no
+
+. if ${OS_VARIANT} == "Minix"
+CPPFLAGS+= -D_OPENBSD_SOURCE
+CONFIGURE_ARGS+= ac_cv_have_decl_O_NONBLOCK=no
+. endif # ${OS_VARIANT} == "Minix"
 .endif
 
 .if (${OPSYS} == "SunOS") && (${OS_VERSION} == "5.8" || ${OS_VERSION} == "5.9")
diff --git a/security/openssh/distinfo b/security/openssh/distinfo
index f776fb466..ff699e927 100644
--- a/security/openssh/distinfo
+++ b/security/openssh/distinfo
@@ -30,3 +30,4 @@ SHA1 (patch-sshd.8) = 5bf48cd27cef8e8810b9dc7115f5180102a345d1
 SHA1 (patch-sshd.c) = cd23ce269bfb48b0caa901e62fc01d35ef0618ac
 SHA1 (patch-sshpty.c) = cb691d4fbde808927f2fbcc12b87ad983cf21938
 SHA1 (patch-uidswap.c) = 68c4f5ffab7f4c5c9c00b7443a74b2da52809b7e
+SHA1 (patch-zz-minix) = aac3d555c2123918638c55696fdc14afb551ba11
diff --git a/security/openssh/patches/patch-zz-minix b/security/openssh/patches/patch-zz-minix
new file mode 100644
index 000000000..cf1f75b74
--- /dev/null
+++ b/security/openssh/patches/patch-zz-minix
@@ -0,0 +1,22 @@
+--- sshd_config.orig	Sun Oct 16 17:09:47 2016
++++ sshd_config	Sun Oct 16 17:12:50 2016
+@@ -101,12 +101,19 @@
+ #X11Forwarding no
+ #X11DisplayOffset 10
+ #X11UseLocalhost yes
++
++# LSC: Uncomment if you wish to use X11 forwarding. To actually
++#      activate X11 forwarding, you also need to set X11Forwarding yes.
++#XAuthLocation /usr/X11R7/bin/xauth # LSC: Use Native xauth
++#X11UseLocalhost no # LSC: Workaround SSHD bug
++
+ #PermitTTY yes
+ #PrintMotd yes
+ #PrintLastLog yes
+ #TCPKeepAlive yes
+ #UseLogin no
+ #UsePrivilegeSeparation sandbox
++UsePrivilegeSeparation no # LSC: for Minix, this is not supported ATM.
+ #PermitUserEnvironment no
+ #Compression delayed
+ #ClientAliveInterval 0