diff --git a/srcpkgs/openssh/files/sshd.service b/srcpkgs/openssh/files/sshd.service
index 3cb8321f92..62fbe90457 100644
--- a/srcpkgs/openssh/files/sshd.service
+++ b/srcpkgs/openssh/files/sshd.service
@@ -8,6 +8,7 @@
 Description=SSH Secure Shell Service
 Wants=sshdgenkeys.service
 After=sshdgenkeys.service
+After=network.target
 
 [Service]
 ExecStart=/usr/sbin/sshd -D
diff --git a/srcpkgs/openssh/files/sshd.socket b/srcpkgs/openssh/files/sshd.socket
index fc0dc6708d..e09e328690 100644
--- a/srcpkgs/openssh/files/sshd.socket
+++ b/srcpkgs/openssh/files/sshd.socket
@@ -1,7 +1,6 @@
 [Unit]
 Conflicts=sshd.service
 Wants=sshdgenkeys.service
-After=sshdgenkeys.service
 
 [Socket]
 ListenStream=22
diff --git a/srcpkgs/openssh/files/sshdgenkeys.service b/srcpkgs/openssh/files/sshdgenkeys.service
index d241ab0f6d..10ebbe801a 100644
--- a/srcpkgs/openssh/files/sshdgenkeys.service
+++ b/srcpkgs/openssh/files/sshdgenkeys.service
@@ -1,10 +1,15 @@
 [Unit]
 Description=OpenSSH server Key Generation
+ConditionPathExists=|!/etc/ssh/ssh_host_key
+ConditionPathExists=|!/etc/ssh/ssh_host_key.pub
+ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key
+ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub
+ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key
+ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key.pub
+ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key
+ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub
 
 [Service]
 Type=oneshot
 ExecStart=/usr/bin/ssh-keygen -A
 RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index d5ffb33ee2..c94e025d9b 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
-version=6.2p2
-revision=2
+version=6.3p1
+revision=1
 build_style=gnu-configure
 configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -15,7 +15,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=7f29b9d2ad672ae0f9e1dcbff871fc5c2e60a194e90c766432e32161b842313b
+checksum=aea575ededd3ebd45c05d42d0a87af22c79131a847ea440c54e3fdd223f5a420
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-kerberos5=$XBPS_CROSS_BASE"