diff --git a/srcpkgs/openssh/patches/openssh-fix-includes.diff b/srcpkgs/openssh/patches/openssh-fix-includes.diff
new file mode 100644
index 0000000000..25d0211380
--- /dev/null
+++ b/srcpkgs/openssh/patches/openssh-fix-includes.diff
@@ -0,0 +1,12 @@
+--- includes.h.orig
++++ includes.h
+@@ -21,6 +21,8 @@
+ #define _GNU_SOURCE /* activate extra prototypes for glibc */
+ 
+ #include <sys/types.h>
++#include <sys/param.h>
++#include <sys/time.h>
+ #include <sys/socket.h> /* For CMSG_* */
+ 
+ #ifdef HAVE_LIMITS_H
+
diff --git a/srcpkgs/openssh/patches/openssh-fix-utmp.diff b/srcpkgs/openssh/patches/openssh-fix-utmp.diff
new file mode 100644
index 0000000000..029d2fec28
--- /dev/null
+++ b/srcpkgs/openssh/patches/openssh-fix-utmp.diff
@@ -0,0 +1,21 @@
+--- loginrec.c.orig
++++ loginrec.c
+@@ -784,12 +784,12 @@
+ 	/* this is just a 128-bit IPv6 address */
+ 	if (li->hostaddr.sa.sa_family == AF_INET6) {
+ 		sa6 = ((struct sockaddr_in6 *)&li->hostaddr.sa);
+-		memcpy(ut->ut_addr_v6, sa6->sin6_addr.s6_addr, 16);
++		memcpy(utx->ut_addr_v6, sa6->sin6_addr.s6_addr, 16);
+ 		if (IN6_IS_ADDR_V4MAPPED(&sa6->sin6_addr)) {
+-			ut->ut_addr_v6[0] = ut->ut_addr_v6[3];
+-			ut->ut_addr_v6[1] = 0;
+-			ut->ut_addr_v6[2] = 0;
+-			ut->ut_addr_v6[3] = 0;
++			utx->ut_addr_v6[0] = utx->ut_addr_v6[3];
++			utx->ut_addr_v6[1] = 0;
++			utx->ut_addr_v6[2] = 0;
++			utx->ut_addr_v6[3] = 0;
+ 		}
+ 	}
+ # endif
+
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 1fe977f2a0..b5c75645dd 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=6.7p1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody