diff --git a/srcpkgs/keychain/patches/openssh-6.8-format.patch b/srcpkgs/keychain/patches/openssh-6.8-format.patch
new file mode 100644
index 0000000000..fdd9d6634c
--- /dev/null
+++ b/srcpkgs/keychain/patches/openssh-6.8-format.patch
@@ -0,0 +1,16 @@
+OpenSSH 6.8 changed fingerprint format to SHA256:base64.
+
+--- keychain.sh.orig	2015-03-18 10:43:15.441403693 +0100
++++ keychain.sh	2015-03-18 10:44:51.825161724 +0100
+@@ -666,6 +666,11 @@ extract_fingerprints() {
+                 #   2048 00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00 /home/barney/.ssh/id_rsa.pub
+                 echo "$ef_line" | cut -f3 -d' '
+                 ;;
++	    *\ SHA256:*)
++                # The new OpenSSH format from 6.8, we hope
++                #   1024 SHA256:[base64] /home/barney/.ssh/id_dsa (RSA)
++                echo "$ef_line"|awk '{print $2}'|cut -f2 -d':'
++                ;;
+             *\ [0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]:*)
+                 # The more consistent OpenSSH format, we hope
+                 #   1024 00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00 /home/barney/.ssh/id_dsa (DSA)
diff --git a/srcpkgs/keychain/template b/srcpkgs/keychain/template
index e05b01eb2d..45c9990010 100644
--- a/srcpkgs/keychain/template
+++ b/srcpkgs/keychain/template
@@ -1,7 +1,7 @@
 # Template file for 'keychain'
 pkgname=keychain
 version=2.7.1
-revision=3
+revision=4
 noarch="yes"
 hostmakedepends="perl"
 short_desc="keychain manager for ssh-agent and gpg-agent"
@@ -14,8 +14,7 @@ checksum=1107fe3f78f6429d4861d64c5666f068f159326d22ab80a8ed0948cb25375191
 do_build() {
   	make ${makejobs}
 }
-
 do_install() {
-	vinstall keychain 755 usr/bin
-	vinstall keychain.1 644 usr/share/man/man1
+	vbin keychain
+	vman keychain.1
 }