diff --git a/srcpkgs/openssh/openssh-client.template b/srcpkgs/openssh/openssh-client.template
index 820ddaf1643..3e3450743b2 100644
--- a/srcpkgs/openssh/openssh-client.template
+++ b/srcpkgs/openssh/openssh-client.template
@@ -1,6 +1,5 @@
 # Template file for 'openssh-client'.
 #
-revision=2
 short_desc="The OpenSSH client"
 long_desc="${long_desc}
 
@@ -8,10 +7,9 @@ long_desc="${long_desc}
 
 conf_files="/etc/ssh/ssh_config"
 
-Add_dependency run openssh		">=${version}"
+Add_dependency run openssh ">=${version}"
 
-do_install()
-{
+do_install() {
 	for f in scp sftp slogin ssh ssh-add ssh-agent \
 		 ssh-copy-id ssh-keyscan findssl; do
 		vmove usr/bin/${f} usr/bin
diff --git a/srcpkgs/openssh/openssh-server.rshlibs b/srcpkgs/openssh/openssh-server.rshlibs
index 34df1f53f38..ae949e33e0a 100644
--- a/srcpkgs/openssh/openssh-server.rshlibs
+++ b/srcpkgs/openssh/openssh-server.rshlibs
@@ -1,4 +1,3 @@
-libwrap.so.0
 libpam.so.0
 libcrypto.so.1
 libutil.so.1
diff --git a/srcpkgs/openssh/openssh-server.template b/srcpkgs/openssh/openssh-server.template
index 010e7e202a0..b651a6272f5 100644
--- a/srcpkgs/openssh/openssh-server.template
+++ b/srcpkgs/openssh/openssh-server.template
@@ -5,15 +5,12 @@ long_desc="${long_desc}
 
  This package contains the ${pkgname} server files."
 
-revision=5
-
 conf_files="/etc/ssh/sshd_config /etc/pam.d/sshd"
 systemd_services="sshd.service on sshdgenkeys.service on"
 
-Add_dependency run openssh		">=${version}"
+Add_dependency run openssh ">=${version}"
 
-do_install()
-{
+do_install() {
 	vmove usr/libexec/sftp-server usr/libexec
 	vmove etc/ssh/sshd_config etc/ssh
 	vmove usr/sbin usr
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index fd87d7580d1..84b77c94999 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,19 +1,18 @@
 # Template file for 'openssh'
 pkgname=openssh
-version=5.9p1
+version=6.0p1
 distfiles="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$version.tar.gz"
 build_style=gnu-configure
-configure_args="--with-tcp-wrappers --datadir=/usr/share/openssh
+configure_args="--without-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"
 license="BSD"
-checksum=8d3e8b6b6ff04b525a6dfa6fdeb6a99043ccf6c3310cc32eba84c939b07777d5
+checksum=589d48e952d6c017e667873486b5df63222f9133d417d0002bd6429d9bd882de
 long_desc="
  SSH (Secure SHell) is a program for logging into and executing
  commands on a remote machine. SSH is intended to replace rlogin and
@@ -35,15 +34,13 @@ subpackages="$pkgname-client $pkgname-server"
 Add_dependency run shadow
 
 Add_dependency build perl ">=0"
-Add_dependency build tcp_wrappers-devel
 Add_dependency build zlib-devel
 Add_dependency build openssl-devel
 Add_dependency build pam-devel
 Add_dependency build mit-krb5-devel
 Add_dependency build e2fsprogs-devel
 
-post_install()
-{
+post_install() {
 	vinstall contrib/sshd.pam.generic 644 etc/pam.d sshd
 	vinstall contrib/findssl.sh 755 usr/bin findssl
 	vinstall contrib/ssh-copy-id 755 usr/bin