diff --git a/srcpkgs/openssh/files/sshdgenkeys.service b/srcpkgs/openssh/files/sshdgenkeys.service
index 10ebbe801a3..0962d844851 100644
--- a/srcpkgs/openssh/files/sshdgenkeys.service
+++ b/srcpkgs/openssh/files/sshdgenkeys.service
@@ -1,11 +1,13 @@
 [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_ecdsa_key
+ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub
+ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key
+ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key.pub
+ConditionPathExists=|!/etc/ssh/ssh_host_key
+ConditionPathExists=|!/etc/ssh/ssh_host_key.pub
 ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key
 ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub
 
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 97546bd2509..69fa1c298b9 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -2,7 +2,7 @@
 _desc="The OpenSSH implementation of SSH protocol"
 
 pkgname=openssh
-version=6.4p1
+version=6.5p1
 revision=1
 build_style=gnu-configure
 configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh
@@ -19,7 +19,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=5530f616513b14aea3662c4c373bafd6a97a269938674c006377e381f68975d2
+checksum=a1195ed55db945252d5a1730d4a2a2a5c1c9a6aa01ef2e5af750a962623d9027
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-kerberos5=$XBPS_CROSS_BASE"