diff --git a/srcpkgs/openssh/files/sshd.service b/srcpkgs/openssh/files/sshd.service
index 62fbe904573..fdddf3753e1 100644
--- a/srcpkgs/openssh/files/sshd.service
+++ b/srcpkgs/openssh/files/sshd.service
@@ -11,7 +11,7 @@ After=sshdgenkeys.service
 After=network.target
 
 [Service]
-ExecStart=/usr/sbin/sshd -D
+ExecStart=/usr/bin/sshd -D
 
 [Install]
 WantedBy=multi-user.target
diff --git a/srcpkgs/openssh/files/sshd/run b/srcpkgs/openssh/files/sshd/run
index a3055665de8..b5e744a6fa8 100755
--- a/srcpkgs/openssh/files/sshd/run
+++ b/srcpkgs/openssh/files/sshd/run
@@ -1,4 +1,4 @@
 #!/bin/sh
 ssh-keygen -A >/dev/null 2>&1 # Will generate host keys if they don't already exist
 [ -r conf ] && . ./conf
-exec /usr/sbin/sshd -D $OPTS
+exec /usr/bin/sshd -D $OPTS
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 123268f5754..840c70e47d6 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,9 +1,9 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=6.8p1
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--datadir=/usr/share/openssh
+configure_args="--sbindir=/usr/bin --datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
  --with-mantype=doc --without-rpath --with-xauth=/usr/bin/xauth
  --disable-strip --with-privsep-path=/var/chroot/ssh