diff --git a/.cvsignore b/.cvsignore
index e546e22..65547d9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-flashrom-4107.tar.bz2
+flashrom-0.9.0.tar.bz2
diff --git a/flashrom--Makefile_cleanup.diff b/flashrom--Makefile_cleanup.diff
index 6e362c7..db8ce28 100644
--- a/flashrom--Makefile_cleanup.diff
+++ b/flashrom--Makefile_cleanup.diff
@@ -1,7 +1,7 @@
---- Makefile.orig	2009-01-26 09:42:02.000000000 +0300
-+++ Makefile	2009-03-11 15:46:46.227346626 +0300
-@@ -9,14 +9,14 @@
- CC      = gcc
+--- Makefile~	2009-05-04 03:37:07.000000000 +0400
++++ Makefile	2009-05-05 10:00:38.680942737 +0400
+@@ -9,9 +9,9 @@
+ CC     ?= gcc
  STRIP	= strip
  INSTALL = /usr/bin/install
 -PREFIX  = /usr/local
@@ -12,19 +12,7 @@
  LDFLAGS = 
  
  OS_ARCH	= $(shell uname)
- ifneq ($(OS_ARCH), SunOS)
--STRIP_ARGS = -s
-+#STRIP_ARGS = -s
- endif
- ifeq ($(OS_ARCH), Darwin)
- CFLAGS += -I/usr/local/include
-@@ -40,12 +40,11 @@
- 
- # Set the flashrom version string from the highest revision number
- # of the checked out flashrom files.
--SVNDEF := -D'FLASHROM_VERSION="$(shell svnversion -cn . \
-+#SVNDEF := -D'FLASHROM_VERSION="$(shell svnversion -cn . \
-           | sed -e "s/.*://" -e "s/\([0-9]*\).*/\1/")"'
+@@ -43,7 +43,6 @@
  
  $(PROGRAM): $(OBJS)
  	$(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS)
diff --git a/flashrom.spec b/flashrom.spec
index 26e5973..b7c15de 100644
--- a/flashrom.spec
+++ b/flashrom.spec
@@ -1,15 +1,12 @@
-%define svnver 4107
 Summary:	Simple program for reading/writing BIOS chips content
 Name:		flashrom
-Version:	0
-Release:	0.18.20090414svn%{svnver}%{?dist}
+Version:	0.9.0
+Release:	1%{?dist}
 License:	GPLv2
 Group:		Applications/System
-# svn -r %{svnver} export svn://coreboot.org/repos/trunk/util/flashrom flashrom
-# tar -cjvf flashrom-%{svnver}.tar.bz2 flashrom
-Source0:	flashrom-%{svnver}.tar.bz2
+URL:		http://coreboot.org/flashrom
+Source0:	http://qa.coreboot.org/releases/%{name}-%{version}.tar.bz2
 Patch0:		flashrom--Makefile_cleanup.diff
-URL:		http://linuxbios.org/Flashrom
 BuildRequires:	pciutils-devel
 BuildRequires:	zlib-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,12 +19,11 @@ Utility which can be used to detect BIOS chips (DIP, PLCC), read their contents
 and write new contents on the chips ("flash the chip").
 
 %prep
-%setup -q -n %{name}
-%patch0 -b .Makefile_cleanup
+%setup -q
+%patch0 -p0 -b .Makefile_cleanup
 
 %build
-# currently disabling DiscOnChip due to instability
-CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"%{svnver}\"'" %{__make} %{?_smp_mflags}
+CFLAGS="%{optflags}" %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -45,6 +41,9 @@ install -D -p -m644 %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Tue May  5 2009 Peter Lemenkov <lemenkov@gmail.com> 0.9.0-1
+- Ver. 0.9.0
+
 * Tue Apr 14 2009 Peter Lemenkov <lemenkov@gmail.com> 0-0.18.20090414svn4107
 - Various manpage / README fixes
 - Board enable support for HP DL145 G3
diff --git a/import.log b/import.log
index cda7bcc..9f808bf 100644
--- a/import.log
+++ b/import.log
@@ -4,3 +4,4 @@ flashrom-0-0_14_20081103svn3723_fc9:HEAD:flashrom-0-0.14.20081103svn3723.fc9.src
 flashrom-0-0_15_20090112svn3852_fc10:HEAD:flashrom-0-0.15.20090112svn3852.fc10.src.rpm:1231410331
 flashrom-0-0_17_20090311svn3984_fc10:HEAD:flashrom-0-0.17.20090311svn3984.fc10.src.rpm:1236776289
 flashrom-0-0_18_20090414svn4107_fc10:HEAD:flashrom-0-0.18.20090414svn4107.fc10.src.rpm:1239696789
+flashrom-0_9_0-1_fc10:HEAD:flashrom-0.9.0-1.fc10.src.rpm:1241503535
diff --git a/sources b/sources
index 693309c..26275eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-784e25d61ac3ae7f3d31914e963acaa3  flashrom-4107.tar.bz2
+e9953bc012b07ce20e83f253e5199c2a  flashrom-0.9.0.tar.bz2