diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index d7eeab23bfb..d0d6a65c505 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
-version=6.1p1
-revision=4
+version=6.2p1
+revision=1
 build_style=gnu-configure
 configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -10,6 +10,7 @@ configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh
  --with-kerberos5=/usr --with-pid-dir=/run --with-pam LD=$CC"
 replaces="openssh-client<6.1p1"
 makedepends="perl openssl-devel pam-devel e2fsprogs-devel mit-krb5-devel"
+crossmakedepends="zlib-devel openssl-devel pam-devel mit-krb5-devel"
 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)"
@@ -17,11 +18,7 @@ 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=d1c157f6c0852e90c191cc7c9018a583b51e3db4035489cb262639d337a1c411
-
-if [ -n "$XBPS_CROSS_TRIPLET" ]; then
-	crossmakedepends="zlib-devel openssl-devel pam-devel mit-krb5-devel"
-fi
+checksum=58690267d7455f444e87c2f8cd9be91fc686ffc0c02d1ebd0be2ab68149f7160
 
 post_install() {
 	vinstall contrib/sshd.pam.generic 644 etc/pam.d sshd
@@ -33,6 +30,7 @@ post_install() {
 		-e 's|^#\(ListenAddress 0.0.0.0\)|\1|g' \
 		-e 's|^#\(UsePAM\) no|\1 yes|g' \
 		-e 's|^#\(ChallengeResponseAuthentication\) yes|\1 no|g' \
+		-e 's|^#\(PrintMotd\) yes|\1 no|g' \
 		${DESTDIR}/etc/ssh/sshd_config
 
 	# Enable pam_systemd.so by default.