diff --git a/srcpkgs/openssh-client b/srcpkgs/openssh-client
deleted file mode 120000
index dc275a7a7e1..00000000000
--- a/srcpkgs/openssh-client
+++ /dev/null
@@ -1 +0,0 @@
-openssh
\ No newline at end of file
diff --git a/srcpkgs/openssh/files/sshd.service b/srcpkgs/openssh/files/sshd.service
index db01ec029f9..5ce2f5c4141 100644
--- a/srcpkgs/openssh/files/sshd.service
+++ b/srcpkgs/openssh/files/sshd.service
@@ -7,6 +7,7 @@ ExecStart=/usr/sbin/sshd -D
 
 [Install]
 WantedBy=multi-user.target
+Also=sshdgenkeys.service
 
 # Note that this is the service file for running a single SSH server for all
 # incoming connections, suitable only for systems with a large amount of SSH
diff --git a/srcpkgs/openssh/openssh-client.rshlibs b/srcpkgs/openssh/openssh-client.rshlibs
deleted file mode 100644
index 0efc53c5b71..00000000000
--- a/srcpkgs/openssh/openssh-client.rshlibs
+++ /dev/null
@@ -1,6 +0,0 @@
-libc.so.6
-libcrypto.so.1
-libz.so.1
-libresolv.so.2
-libdl.so.2
-libgssapi_krb5.so.2
diff --git a/srcpkgs/openssh/openssh-client.template b/srcpkgs/openssh/openssh-client.template
deleted file mode 100644
index 9cc674ea2b9..00000000000
--- a/srcpkgs/openssh/openssh-client.template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'openssh-client'.
-#
-conf_files="/etc/ssh/ssh_config"
-depends="openssh>=$version"
-short_desc="The OpenSSH client"
-long_desc="${long_desc}
-
- This package contains the ${pkgname} client files."
-
-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
-		[ ! -f ${SRCPKGDESTDIR}/usr/share/man/man1/${f}.1 ] && continue
-		vmove usr/share/man/man1/${f}.1 usr/share/man/man1
-	done
-	vmove etc/ssh/ssh_config etc/ssh
-	vmove usr/share/man/man5/ssh_config.5 usr/share/man/man5
-}
diff --git a/srcpkgs/openssh/openssh-server.INSTALL b/srcpkgs/openssh/openssh-server.INSTALL
index 5cf6a5c2a14..07088006a56 100644
--- a/srcpkgs/openssh/openssh-server.INSTALL
+++ b/srcpkgs/openssh/openssh-server.INSTALL
@@ -2,13 +2,14 @@ case $ACTION in
 post)
 	cat <<_EOF
 ===========================================================================
+
 Two systemd services are provided by ${PKGNAME}-${VERSION}:
 
 	- sshd.service (starts a single instance of sshd)
 	- sshd.socket (per-connection on demand sshd)
 
-By default we enable the on-demand per-connection daemon, which is lighter
-when there are few connections.
+Feel free to start/enable your preferred solution :-)
+
 ===========================================================================
 _EOF
 	;;
diff --git a/srcpkgs/openssh/openssh-server.template b/srcpkgs/openssh/openssh-server.template
index 84c53ac096d..f0f39fdd642 100644
--- a/srcpkgs/openssh/openssh-server.template
+++ b/srcpkgs/openssh/openssh-server.template
@@ -1,7 +1,6 @@
 # Template file for 'openssh-server'.
 #
 conf_files="/etc/ssh/sshd_config /etc/pam.d/sshd"
-systemd_services="sshd.socket on"
 make_dirs="/var/chroot/ssh 0755 root root"
 depends="openssh>=$version"
 short_desc="The OpenSSH server"
diff --git a/srcpkgs/openssh/openssh.rshlibs b/srcpkgs/openssh/openssh.rshlibs
index 5cd93488632..54766bcc7c8 100644
--- a/srcpkgs/openssh/openssh.rshlibs
+++ b/srcpkgs/openssh/openssh.rshlibs
@@ -1,3 +1,4 @@
+libgssapi_krb5.so.2
 libresolv.so.2
 libcrypto.so.1
 libdl.so.2
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 0f7251b0d0a..4a7973c0de5 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,23 +1,24 @@
 # Template file for 'openssh'
 pkgname=openssh
-version=6.0p1
-revision=4
+version=6.1p1
+revision=1
 build_style=gnu-configure
 configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh
---sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody --with-pam
+--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
 --with-mantype=man --without-rpath --with-xauth=/usr/bin/xauth
 --with-ssl-engine --disable-strip --with-privsep-path=/var/chroot/ssh
---with-kerberos5=/usr --with-pid-dir=/run"
+--with-kerberos5=/usr --with-pid-dir=/run --with-pam"
 depends="shadow"
+replaces="openssh-client<6.1p1"
 makedepends="perl>=0 zlib-devel openssl-devel pam-devel mit-krb5-devel e2fsprogs-devel"
-conf_files="/etc/ssh/moduli"
-subpackages="$pkgname-client $pkgname-server"
-short_desc="The OpenSSH implementation of SSH protocol versions 1 and 2"
+conf_files="/etc/ssh/moduli /etc/ssh/ssh_config"
+subpackages="$pkgname-server"
+short_desc="The OpenSSH implementation of SSH protocol versions 1 and 2 (client)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.openssh.org"
 license="BSD"
 distfiles="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$version.tar.gz"
-checksum=589d48e952d6c017e667873486b5df63222f9133d417d0002bd6429d9bd882de
+checksum=d1c157f6c0852e90c191cc7c9018a583b51e3db4035489cb262639d337a1c411
 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
@@ -29,9 +30,7 @@ long_desc="
  it up to date in terms of security and features, as well as removing
  all patented algorithms to separate libraries.
 
- This package includes the core files necessary for both the OpenSSH
- client and server. To make this package useful, you should also
- install openssh-client, openssh-server, or both."
+ This package contains the ${pkgname} client files."
 
 post_install() {
 	vinstall contrib/sshd.pam.generic 644 etc/pam.d sshd