diff --git a/srcpkgs/openssh/openssh-server.template b/srcpkgs/openssh/openssh-server.template
index b04298c2b5e..010e7e202a0 100644
--- a/srcpkgs/openssh/openssh-server.template
+++ b/srcpkgs/openssh/openssh-server.template
@@ -5,7 +5,7 @@ long_desc="${long_desc}
 
  This package contains the ${pkgname} server files."
 
-revision=4
+revision=5
 
 conf_files="/etc/ssh/sshd_config /etc/pam.d/sshd"
 systemd_services="sshd.service on sshdgenkeys.service on"
@@ -14,7 +14,7 @@ Add_dependency run openssh		">=${version}"
 
 do_install()
 {
-	vmove usr/libexec/openssh/sftp-server usr/libexec
+	vmove usr/libexec/sftp-server usr/libexec
 	vmove etc/ssh/sshd_config etc/ssh
 	vmove usr/sbin usr
 	vmove usr/share/man/man5/sshd_config.5 usr/share/man/man5
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 65674ab3ca6..fd87d7580d1 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -3,12 +3,12 @@ pkgname=openssh
 version=5.9p1
 distfiles="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$version.tar.gz"
 build_style=gnu-configure
-configure_args="--libexecdir=/usr/libexec/openssh --with-tcp-wrappers
---datadir=/usr/share/openssh --sysconfdir=/etc/ssh --without-selinux
---with-privsep-user=nobody --with-pam --with-mantype=man --without-rpath
---with-xauth=/usr/bin/xauth --with-ssl-engine --disable-strip
---with-privsep-path=/var/chroot/ssh --with-kerberos5=/usr"
-revision=1
+configure_args="--with-tcp-wrappers --datadir=/usr/share/openssh
+--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody --with-pam
+--with-mantype=man --without-rpath --with-xauth=/usr/bin/xauth
+--with-ssl-engine --disable-strip --with-privsep-path=/var/chroot/ssh
+--with-kerberos5=/usr"
+revision=2
 short_desc="The OpenSSH implementation of SSH protocol versions 1 and 2"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.openssh.org"