diff --git a/srcpkgs/keychain/patches/openssh-6.8-format.patch b/srcpkgs/keychain/patches/openssh-6.8-format.patch
deleted file mode 100644
index fdd9d6634c..0000000000
--- a/srcpkgs/keychain/patches/openssh-6.8-format.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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 45c9990010..5a224626f8 100644
--- a/srcpkgs/keychain/template
+++ b/srcpkgs/keychain/template
@@ -1,19 +1,15 @@
 # Template file for 'keychain'
 pkgname=keychain
-version=2.7.1
-revision=4
-noarch="yes"
-hostmakedepends="perl"
-short_desc="keychain manager for ssh-agent and gpg-agent"
+version=2.8.0
+revision=1
+noarch=yes
+short_desc="Keychain manager for ssh-agent and gpg-agent"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.funtoo.org/wiki/Keychain"
 license="GPL-2"
 distfiles="http://www.funtoo.org/archive/$pkgname/$pkgname-$version.tar.bz2"
-checksum=1107fe3f78f6429d4861d64c5666f068f159326d22ab80a8ed0948cb25375191
+checksum=411bfe6a3ac9daca1c35f9a56828f03cc8474e8a668e122773397deb8f7a0799
 
-do_build() {
-  	make ${makejobs}
-}
 do_install() {
 	vbin keychain
 	vman keychain.1