diff --git a/coreboot-utils.changes b/coreboot-utils.changes
index 705ca78..01d11d9 100644
--- a/coreboot-utils.changes
+++ b/coreboot-utils.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Tue Aug 18 20:32:39 CEST 2009 - kernel01@hailfinger.org
+
+- Update flashrom to version 0.9.1-rc1
+* Support for more external flashers
+* Universal external flasher protocol
+* Automatic write/erase verification
+* Dozens of added flash chips, chipsets, mainboards
+* No root privileges needed for most external flashers
+* Improved more verbose user interface
+* Speedups: Fast bus type dependent probing, 100x faster write for
+  some chips
+* Reliability fixes for buggy hardware, corner case spec
+  conformance
+
+-------------------------------------------------------------------
+Mon Jun 22 21:48:15 CEST 2009 - trenn@suse.de
+
+- Update coreboot-utils to version 0.9.0
+
 -------------------------------------------------------------------
 Thu Jan  8 17:37:43 CET 2009 - bbrunner@suse.de
 
diff --git a/coreboot-utils.spec b/coreboot-utils.spec
index c257176..12ab5e2 100644
--- a/coreboot-utils.spec
+++ b/coreboot-utils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package coreboot-utils (Version r3852)
+# spec file for package coreboot-utils (Version 0.9.0)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,14 +19,15 @@
 
 
 Name:           coreboot-utils
-Url:            http://linuxbios.org/
-Summary:        A universal flash programming utility
-Version:        r3852
-Release:        2
+Url:            http://coreboot.org/
+Summary:        A universal flashrom programming utility
+Version:        0.9.0
+Release:        1
+%define flashrom_svnrevision r687
 %define nvramtool_version r3852
-License:        GPL v2 only; GPL v2 or later
+License:        GPL v2 only ; GPL v2 or later
 Group:          Development/Tools/Other
-Source0:        flashrom-svn-%{version}.tar.bz2
+Source0:        flashrom-%{version}-%{flashrom_svnrevision}.tar.bz2
 Source1:        nvramtool-svn-%{nvramtool_version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  pciutils-devel zlib-devel
@@ -43,17 +44,34 @@ images, for example.
 
 Authors:
 --------
-    Yinghai Lu <yinghai.lu@amd.com>
+    Carl-Daniel Hailfinger
+    Claus Gindhart <claus.gindhart@kontron.com>
+    Dominik Geyer <dominik.geyer@kontron.com>
+    Eric Biederman <ebiederman@lnxi.com>
+    Giampiero Giancipoli <gianci@email.it>
+    Joe Bao <Zheng.Bao@amd.com>
+    Luc Verhaegen <libv@skynet.be>
+    Li-Ta Lo
+    Markus Boas <ryven@ryven.de>
+    Nikolay Petukhov <nikolay.petukhov@gmail.com>
+    Peter Stuge <peter@stuge.se>
+    Reinder E.N. de Haan <lb_reha@mveas.com>
+    Ronald G. Minnich <rminnich@gmail.com>
+    Ronald Hoogenboom <ronald@zonnet.nl>
     Stefan Reinauer <stepan@coresystems.de>
-    Niki W. Waibel <niki.waibel@gmx.net>
+    Stefan Wildemann <stefan.wildemann@kontron.com>
+    Steven James <pyro@linuxlabs.com>
+    Uwe Hermann <uwe@hermann-uwe.de>
+    Wang Qingpei <Qingpei.Wang@amd.com>
+    Yinghai Lu <yinghai.lu@amd.com>
+    some others
 
 %prep
-%setup -q -n flashrom-svn-%{version} -a 1
+%setup -q -n flashrom-%{version}-%{flashrom_svnrevision} -a 1
 
 %build
 make %{?jobs:-j%jobs} \
-        CFLAGS="$RPM_OPT_FLAGS -Os -Wall -DDISABLE_DOC " \
-        LDFLAGS="-lpci -lz"
+        CFLAGS="$RPM_OPT_FLAGS -Os -Wall "
 gzip flashrom.8
 cd nvramtool-svn-%{nvramtool_version}
 make %{?jobs:-j%jobs} \
@@ -73,6 +91,7 @@ install -m 0755 nvramtool $RPM_BUILD_ROOT/%{_bindir}
 install -m 0644 nvramtool.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8
 cd -
 cp README README.flashrom
+cp ChangeLog ChangeLog.flashrom
 cp nvramtool-svn-%{nvramtool_version}/COPYING .
 cp nvramtool-svn-%{nvramtool_version}/DISCLAIMER DISCLAIMER.nvramtool
 cp nvramtool-svn-%{nvramtool_version}/README README.nvramtool
@@ -84,7 +103,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %doc COPYING
-%doc README.flashrom
+%doc README.flashrom ChangeLog.flashrom serprog-protocol.txt
 %doc DISCLAIMER.nvramtool ChangeLog.nvramtool README.nvramtool
 %{_sbindir}/flashrom
 %{_bindir}/nvramtool
@@ -92,24 +111,3 @@ rm -rf %{buildroot}
 %{_mandir}/man8/flashrom.8.gz
 
 %changelog
-* Thu Jan 08 2009 bbrunner@suse.de
-- update nvramtool to svn release r3852
-- update flashrom to svn release r3852
-* Wed Oct 15 2008 bwalle@suse.de
-- update nvramtool to svn release r3613
-- update flashrom to svn release r3659
-* Wed Aug 13 2008 ro@suse.de
-- add ExclusiveArch
-* Mon Mar 17 2008 bwalle@suse.de
-- rename lxbios to nvramtool
-- update nvramtool to svn release r3124
-- update flashrom to svn release r3153
-* Sun Jan 20 2008 bwalle@suse.de
-- update to svn release r3061
-  o Support SPI flash chips bigger than 512 kByte sitting behind
-  IT8716F Super I/O performing LPC-to-SPI flash translation.
-  o Enable MX25L8005 support in flashrom.
-  o Minor changes.
-- add lxbios utility
-* Thu Jan 10 2008 bwalle@suse.de
-- initial package
diff --git a/flashrom-0.9.0-r687.tar.bz2 b/flashrom-0.9.0-r687.tar.bz2
new file mode 100644
index 0000000..6c93898
--- /dev/null
+++ b/flashrom-0.9.0-r687.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:073d64fc6bcf5191fd73b3739b224d86f2d4daece5cc91484b36e71232633c5e
+size 140648
diff --git a/flashrom-svn-r3852.tar.bz2 b/flashrom-svn-r3852.tar.bz2
deleted file mode 100644
index 4748a6a..0000000
--- a/flashrom-svn-r3852.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:957d98bb44f34099d0943ddd26e681312e14fb5d5dd368e3b80bb3b8fa93922a
-size 68889