diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 6329e131e95..8afd8a2c038 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -3,14 +3,14 @@ _desc="The OpenSSH implementation of SSH protocol"
 
 pkgname=openssh
 version=6.6p1
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh
  --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-pid-dir=/run --with-pam --with-pie --without-kerberos5 LD=$CC"
-hostmakedepends="perl"
+hostmakedepends="libtool perl"
 makedepends="zlib-devel openssl-devel pam-devel"
 short_desc="${_desc} - client"
 replaces="openssh-client<6.1p1"
@@ -21,6 +21,19 @@ license="BSD"
 distfiles="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$version.tar.gz"
 checksum=48c1f0664b4534875038004cc4f3555b8329c2a81c1df48db5c517800de203bb
 
+# Package build options
+build_options="openssh_identitypersist"
+desc_option_openssh_identitypersist="add key to ssh-agent(1) upon connecting"
+
+pre_configure() {
+	if [ "$build_option_openssh_identitypersist" ]; then
+		$XBPS_FETCH_CMD "https://bugzilla.mindrot.org/attachment.cgi?id=2396>identpersist.patch"
+		patch -sNp1 -i identpersist.patch
+		msg_normal "$pkgver: applied identitypersist patch.\n"
+	fi
+	libtoolize -f
+}
+
 post_install() {
 	vinstall contrib/sshd.pam.generic 644 etc/pam.d sshd
 	vinstall contrib/ssh-copy-id 755 usr/bin