diff --git a/suse-build-key.changes b/suse-build-key.changes
index 1a04c0a..1b794a7 100644
--- a/suse-build-key.changes
+++ b/suse-build-key.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon May  5 18:31:20 CEST 2008 - ro@suse.de
+
+- updated keys
+  9C800ACA,8495160C,307E3D54: extend expiration by 2 years
+  until 2010-05-05
+  7E2E3B05: extend expiration by 2 years until 2010-05-24 
+
 -------------------------------------------------------------------
 Mon Mar 19 16:49:05 CET 2007 - rguenther@suse.de
 
diff --git a/suse-build-key.gpg b/suse-build-key.gpg
index 4dc075d..052a93b 100644
Binary files a/suse-build-key.gpg and b/suse-build-key.gpg differ
diff --git a/suse-build-key.spec b/suse-build-key.spec
index 673d784..0a6260b 100644
--- a/suse-build-key.spec
+++ b/suse-build-key.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package suse-build-key (Version 1.0)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -10,20 +10,21 @@
 
 # norootforbuild
 
+
 Name:           suse-build-key
 BuildRequires:  gpg
-License:        GNU General Public License (GPL)
+License:        GPL v2 or later
 Group:          System/Packages
 Provides:       build-key
 Requires:       gpg
-Autoreqprov:    off
+AutoReqProv:    off
 Summary:        The public gpg key for rpm package signature verification
 Version:        1.0
-Release:        717
+Release:        843
 Source0:        suse-build-key.gpg
 Source1:        dumpsigs
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildArchitectures: noarch
+BuildArch:      noarch
 %define pubring  usr/lib/rpm/gnupg/pubring.gpg
 %define susering usr/lib/rpm/gnupg/suse-build-key.gpg
 PreReq:         sh-utils gpg fileutils mktemp
@@ -113,56 +114,61 @@ fi
 chmod 600 root/.gnupg/pubring.gpg
 
 %changelog
-* Mon Mar 19 2007 - rguenther@suse.de
+* Mon May 05 2008 ro@suse.de
+- updated keys
+  9C800ACA,8495160C,307E3D54: extend expiration by 2 years
+  until 2010-05-05
+  7E2E3B05: extend expiration by 2 years until 2010-05-24
+* Mon Mar 19 2007 rguenther@suse.de
 - merge suse-build-key keyring to roots gpg pubring
-* Mon May 29 2006 - ro@suse.de
+* Mon May 29 2006 ro@suse.de
 - added new official provo dsa autobuild key ID 7E2E3B05
-* Fri May 19 2006 - ro@suse.de
+* Fri May 19 2006 ro@suse.de
 - removed unused provo autobuild key
 - added new official provo autobuild key ID A1912208
-* Thu Apr 20 2006 - ro@suse.de
+* Thu Apr 20 2006 ro@suse.de
 - add dumpsigs script here to have _one_ place for the script
-* Fri Mar 31 2006 - ro@suse.de
+* Fri Mar 31 2006 ro@suse.de
 - added build@suse.de rsa key ID 307E3D54
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Tue Oct 18 2005 - ro@suse.de
+* Tue Oct 18 2005 ro@suse.de
 - use correct provo autobuild key
-* Tue Oct 18 2005 - ro@suse.de
+* Tue Oct 18 2005 ro@suse.de
 - added provo autobuild signing key (#128128)
 - removed jds key
-* Fri May 27 2005 - mls@suse.de
+* Fri May 27 2005 mls@suse.de
 - added mktemp to PreReqs [#86177]
-* Thu Apr 28 2005 - ro@suse.de
+* Thu Apr 28 2005 ro@suse.de
 - added JDS public key (15c17deb)
-* Tue Jan 25 2005 - ro@suse.de
+* Tue Jan 25 2005 ro@suse.de
 - added OES public key (0dfb3188)
-* Tue Jun 22 2004 - ro@suse.de
+* Tue Jun 22 2004 ro@suse.de
 - updated build key (expiration changed to 2008-06-21) (#42326)
-* Tue Feb 24 2004 - hmacht@suse.de
+* Tue Feb 24 2004 hmacht@suse.de
 - building as non-root
-* Tue Sep 09 2003 - ro@suse.de
+* Tue Sep 09 2003 ro@suse.de
 - ignore return code from first gpg calls
-* Tue Sep 09 2003 - draht@suse.de
+* Tue Sep 09 2003 draht@suse.de
 - call gpg twice without any arguments for proper initialization
   inside postinstall
-* Tue Sep 09 2003 - draht@suse.de
+* Tue Sep 09 2003 draht@suse.de
 - use temp file instead of pipe due to resource race between two
   instances of gpg in %%post.
-* Thu Sep 05 2002 - draht@suse.de
+* Thu Sep 05 2002 draht@suse.de
 - package now installs key from package-owned file into the rpm
   pubring in %%post to allow other key packages to add their keys.
-* Tue Aug 20 2002 - mmj@suse.de
+* Tue Aug 20 2002 mmj@suse.de
 - Correct PreReq
-* Fri Jul 26 2002 - kukuk@suse.de
+* Fri Jul 26 2002 kukuk@suse.de
 - Change Provides from suse-build-key to build-key
-* Thu Feb 21 2002 - draht@suse.de
+* Thu Feb 21 2002 draht@suse.de
 - directory permission problem: 644 -> 755.
-* Mon Feb 18 2002 - ro@suse.de
+* Mon Feb 18 2002 ro@suse.de
 - moved to /usr/lib/rpm/gnupg/pubring.pgp
   rpm needs a directory as gpg_path and will use pubring.gpg
   in that directory
-* Wed Feb 13 2002 - draht@suse.de
+* Wed Feb 13 2002 draht@suse.de
 - initial package. Contains
   - pub  2048R/3D25D3D9 1999-03-06 SuSE Security Team <security@suse.de>
   - pub  1024D/9C800ACA 2000-10-19 SuSE Package Signing Key <build@suse.de>