diff --git a/.cvsignore b/.cvsignore
index d90a6db..a1ab383 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-flashrom-3099.tar.bz2
+flashrom-3332.tar.bz2
diff --git a/flashrom--Makefile_cleanup.diff b/flashrom--Makefile_cleanup.diff
index ea85bed..7fdfdea 100644
--- a/flashrom--Makefile_cleanup.diff
+++ b/flashrom--Makefile_cleanup.diff
@@ -1,30 +1,35 @@
---- Makefile	2007-08-05 15:15:51.000000000 +0400
-+++ Makefile	2007-08-05 15:18:46.000000000 +0400
-@@ -7,18 +7,10 @@
- PROGRAM = flashrom
- 
+--- Makefile.Makefile_cleanup	2008-05-17 05:08:58.000000000 +0400
++++ Makefile	2008-05-17 23:33:17.000000000 +0400
+@@ -9,15 +9,15 @@
  CC      = gcc
--STRIP	= strip
+ STRIP	= strip
  INSTALL = /usr/bin/install
 -PREFIX  = /usr/local
--#CFLAGS  = -O2 -g -Wall -Werror
--CFLAGS  = -Os -Wall -Werror -DDISABLE_DOC # -DTS5300
 +PREFIX  = /usr
+ #CFLAGS  = -O2 -g -Wall -Werror
+-CFLAGS  = -Os -Wall -Werror -DDISABLE_DOC # -DTS5300
++#CFLAGS  = -Os -Wall -Werror -DDISABLE_DOC # -DTS5300
  OS_ARCH	= $(shell uname)
--ifeq ($(OS_ARCH), SunOS)
+ ifeq ($(OS_ARCH), SunOS)
+ LDFLAGS = -lpci -lz
+ else
  LDFLAGS = -lpci -lz
--else
--LDFLAGS = -lpci -lz -static 
 -STRIP_ARGS = -s
--endif
++#STRIP_ARGS = -s
+ endif
+ 
+ OBJS = chipset_enable.o board_enable.o udelay.o jedec.o stm50flw0x0x.c \
+@@ -31,12 +31,11 @@
  
- OBJS = chipset_enable.o board_enable.o udelay.o jedec.o sst28sf040.o \
- 	am29f040b.o mx29f002.o sst39sf020.o m29f400bt.o w49f002u.o \
-@@ -30,7 +22,6 @@
+ # 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/")"'
  
  $(PROGRAM): $(OBJS)
  	$(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS)
 -	$(STRIP) $(STRIP_ARGS) $(PROGRAM)
  
- clean:
- 	rm -f *.o *~
+ flashrom.o: flashrom.c
+ 	$(CC) -c $(CFLAGS) $(SVNDEF) $(CPPFLAGS) $< -o $@
diff --git a/flashrom.spec b/flashrom.spec
index fbde34a..45e5742 100644
--- a/flashrom.spec
+++ b/flashrom.spec
@@ -1,12 +1,12 @@
 Summary:	Simple program for reading/writing BIOS chips content
 Name:		flashrom
 Version:	0
-Release:	0.7.20080209svn3099%{?dist}
+Release:	0.9.20080517svn3332%{?dist}
 License:	GPLv2+
 Group:		Applications/System
-# svn -r 3099 export svn://linuxbios.org/repos/trunk/util/flashrom flashrom
-# tar -cjvf flashrom-3099.tar.bz2 flashrom
-Source0:	flashrom-3099.tar.bz2
+# svn -r 3332 export svn://linuxbios.org/repos/trunk/util/flashrom flashrom
+# tar -cjvf flashrom-3332.tar.bz2 flashrom
+Source0:	flashrom-3332.tar.bz2
 Patch0:		flashrom--Makefile_cleanup.diff
 URL:		http://linuxbios.org/Flashrom
 BuildRequires:	pciutils-devel
@@ -26,7 +26,7 @@ and write new contents on the chips ("flash the chip").
 
 %build
 # currently disabling DiscOnChip due to instability
-CFLAGS="%{optflags} -DDISABLE_DOC" %{__make} %{?_smp_mflags}
+CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"3332\"' -DDISABLE_DOC" %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -44,6 +44,19 @@ install -D -p -m644 %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
 %{_mandir}/man8/%{name}.*
 
 %changelog
+* Sat May 17 2008 Peter Lemenkov <lemenkov@gmail.com> 0-0.9.20080517svn3332
+- Fixed %patch0
+
+* Sat May 17 2008 Peter Lemenkov <lemenkov@gmail.com> 0-0.8.20080517svn3332
+- Support Pm49FL004/2 Block Locking Registers
+- Add support for the Atmel AT25DF321 SPI flash
+- Lots of new SST flash chip IDs
+- Add lots of ATMEL SPI flash chips
+- Add SST39VF512, SST39VF010, SST39VF040 support
+- Add ICH9 detection to flashrom
+- Support for the Winbond W39V080FA series of chips
+- Support for flashing on the Kontron 986LCD-M board
+- Add board_enable for Artec Group DBE61 and DBE62
 
 * Sat Feb  9 2008 Peter Lemenkov <lemenkov@gmail.com> 0-0.7.20080209svn3099
 - Add board enable for VIA EPIA SP
diff --git a/sources b/sources
index 4ff19f9..dc272c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7b3058fdd72c38baed81759abd384aea  flashrom-3099.tar.bz2
+b41566714bbb93b382836451c06c6e9f  flashrom-3332.tar.bz2