diff --git a/openssh/build.sh b/openssh/build.sh
index c40c071..54f3de0 100755
--- a/openssh/build.sh
+++ b/openssh/build.sh
@@ -6,11 +6,11 @@
 ###########################################################
 # Check the following 4 variables before running the script
 topdir=openssh
-version=8.5p1
+version=8.6p1
 pkgver=1
 source[0]=https://cloudflare.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/$topdir-$version.tar.gz
 # If there are no patches, simply comment this
-#patch[0]=
+patch[0]=openssh-8.6-no-stdint_h.patch
 
 # Source function library
 . ${BUILDPKG_SCRIPTS}/buildpkg.functions
@@ -21,7 +21,7 @@ export CPPFLAGS="-I$prefix/include"
 export CC="gcc -D__EXTENSIONS__ -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1"
 make_check_target="tests"
 
-configure_args=(--prefix=$prefix --mandir=$prefix/$_mandir --sysconfdir=$prefix/${_sysconfdir}/ssh --datadir=$prefix/${_sharedir}/openssh --with-default-path=/usr/bin:$prefix/${_bindir} --with-mantype=cat --with-pam --with-privsep-user=sshd --with-privsep-path=/var/empty/sshd --with-superuser-path=/usr/bin:/usr/sbin:$prefix/$_bindir:$prefix/$_sbindir --with-lastlog=/var/adm/lastlog --without-zlib-version-check)
+configure_args=(--prefix=$prefix --mandir=$prefix/$_mandir --sysconfdir=$prefix/${_sysconfdir}/ssh --datadir=$prefix/${_sharedir}/openssh --with-default-path=/usr/bin:$prefix/${_bindir} --with-mantype=man --with-pam --with-privsep-user=sshd --with-privsep-path=/var/empty/sshd --with-superuser-path=/usr/bin:/usr/sbin:$prefix/$_bindir:$prefix/$_sbindir --with-lastlog=/var/adm/lastlog --without-zlib-version-check)
 
 reg prep
 prep()
diff --git a/openssh/meta/ChangeLog b/openssh/meta/ChangeLog
index b218d90..508f6b5 100644
--- a/openssh/meta/ChangeLog
+++ b/openssh/meta/ChangeLog
@@ -1,5 +1,8 @@
 CHANGELOG
 ---------
+* Sat May 08 2021 Tom G. Christensen <swpkg@jupiterrise.com> - 8.6p1-1
+- Update to 8.6p1
+
 * Mon Mar 15 2021 Tom G. Christensen <swpkg@jupiterrise.com> - 8.5p1-1
 - Update to 8.5p1
 
diff --git a/openssh/src/openssh-8.6-no-stdint_h.patch b/openssh/src/openssh-8.6-no-stdint_h.patch
new file mode 100644
index 0000000..6da9960
--- /dev/null
+++ b/openssh/src/openssh-8.6-no-stdint_h.patch
@@ -0,0 +1,84 @@
+diff --git a/regress/unittests/authopt/tests.c b/regress/unittests/authopt/tests.c
+index 8c51b380..1f0494f5 100644
+--- a/regress/unittests/authopt/tests.c
++++ b/regress/unittests/authopt/tests.c
+@@ -11,7 +11,9 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <stdio.h>
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#endif
+ #include <stdlib.h>
+ #include <string.h>
+ 
+diff --git a/regress/unittests/misc/test_argv.c b/regress/unittests/misc/test_argv.c
+index 7a28f64e..f0d7afe0 100644
+--- a/regress/unittests/misc/test_argv.c
++++ b/regress/unittests/misc/test_argv.c
+@@ -10,7 +10,9 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <stdio.h>
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#endif
+ #include <stdlib.h>
+ #include <string.h>
+ 
+diff --git a/regress/unittests/misc/test_convtime.c b/regress/unittests/misc/test_convtime.c
+index 5be3ee43..8f9be89f 100644
+--- a/regress/unittests/misc/test_convtime.c
++++ b/regress/unittests/misc/test_convtime.c
+@@ -10,7 +10,9 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <stdio.h>
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#endif
+ #include <stdlib.h>
+ #include <string.h>
+ 
+diff --git a/regress/unittests/misc/test_expand.c b/regress/unittests/misc/test_expand.c
+index c336fb0b..513c69bc 100644
+--- a/regress/unittests/misc/test_expand.c
++++ b/regress/unittests/misc/test_expand.c
+@@ -10,7 +10,9 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <stdio.h>
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#endif
+ #include <stdlib.h>
+ #include <string.h>
+ 
+diff --git a/regress/unittests/misc/test_parse.c b/regress/unittests/misc/test_parse.c
+index dd99068d..727ff3de 100644
+--- a/regress/unittests/misc/test_parse.c
++++ b/regress/unittests/misc/test_parse.c
+@@ -10,7 +10,9 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <stdio.h>
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#endif
+ #include <stdlib.h>
+ #include <string.h>
+ 
+diff --git a/regress/unittests/misc/tests.c b/regress/unittests/misc/tests.c
+index 75013f48..6bd8859b 100644
+--- a/regress/unittests/misc/tests.c
++++ b/regress/unittests/misc/tests.c
+@@ -10,7 +10,9 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <stdio.h>
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#endif
+ #include <stdlib.h>
+ #include <string.h>
+