diff --git a/.gitignore b/.gitignore
index 5ee4a67..2369402 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /valgrind-3.7.0.tar.bz2
 /valgrind-3.8.0-TEST1.tar.bz2
+/valgrind-3.8.0.tar.bz2
diff --git a/sources b/sources
index fc41671..c420f24 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7f757e3e8fc47c5ea2766385bfacdf7e  valgrind-3.8.0-TEST1.tar.bz2
+ec04dfd1256307432b2a7b520398c526  valgrind-3.8.0.tar.bz2
diff --git a/valgrind-3.7.0-addToXA.patch b/valgrind-3.7.0-addToXA.patch
deleted file mode 100644
index e20b0ed..0000000
--- a/valgrind-3.7.0-addToXA.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- valgrind-3.7.0/coregrind/m_debuginfo/readdwarf3.c	(revision 12489)
-+++ valgrind-3.7.0/coregrind/m_debuginfo/readdwarf3.c	(revision 12490)
-@@ -2661,7 +2661,7 @@ static void parse_type_DIE ( /*MOD*/XArr
-       boundE.cuOff = posn;
-       vg_assert(parser->qparentE[parser->sp].Te.TyArray.boundRs);
-       VG_(addToXA)( parser->qparentE[parser->sp].Te.TyArray.boundRs,
--                    &boundE );
-+                    &boundE.cuOff );
-       /* And record the child itself */
-       goto acquire_Bound;
-    }
diff --git a/valgrind-3.7.0-debug-leak1.patch b/valgrind-3.7.0-debug-leak1.patch
deleted file mode 100644
index 18fd375..0000000
--- a/valgrind-3.7.0-debug-leak1.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- valgrind-3.7.0/coregrind/m_debuginfo/readdwarf3.c	(revision 12408)
-+++ valgrind-3.7.0/coregrind/m_debuginfo/readdwarf3.c	(revision 12409)
-@@ -2547,6 +2547,7 @@ static void parse_type_DIE ( /*MOD*/XArr
-             const members in C++ code which are compile time constants
-             that do no exist in the class. They're not of any interest
-             to us so we ignore them. */
-+         ML_(TyEnt__make_EMPTY)(&fieldE);
-       }
-    }
- 
diff --git a/valgrind.spec b/valgrind.spec
index 3d12ce1..a828dd1 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -1,14 +1,13 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
 Version: 3.8.0
-Release: 0.1.TEST1.svn12858%{?dist}
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2
 URL: http://www.valgrind.org/
 Group: Development/Debuggers
 
-#Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
-Source0: valgrind-%{version}-TEST1.tar.bz2
+Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
 Patch1: valgrind-3.8.0-cachegrind-improvements.patch
 Patch2: valgrind-3.8.0-openat.patch
 Patch3: valgrind-3.8.0-helgrind-race-supp.patch
@@ -119,7 +118,8 @@ ar r libgcc/libgcc_s_32.a
 CC="gcc -B `pwd`/libgcc/"
 %endif
 %configure CC="$CC" \
-	CFLAGS="" CXXFLAGS="" LDFLAGS="" \
+  CFLAGS="`echo " %{optflags} " | sed 's/ -m\(64\|3[21]\) / /g;s/ \(-fexceptions\|-fstack-protector\|-Wp,-D_FORTIFY_SOURCE=2\) / /g;s/^ //;s/ $//'`" \
+  CXXFLAGS="`echo " %{optflags} " | sed 's/ -m\(64\|3[21]\) / /g;s/ \(-fexceptions\|-fstack-protector\|-Wp,-D_FORTIFY_SOURCE=2\) / /g;s/^ //;s/ $//'`" \
 %ifarch %{ix86} x86_64 ppc ppc64
   --with-mpicc=%{_libdir}/openmpi/bin/mpicc \
 %endif
@@ -201,6 +201,11 @@ echo ===============END TESTING===============
 %endif
 
 %changelog
+* Fri Aug 10 2012 Jakub Jelinek <jakub@redhat.com> 3.8.0-1
+- update to 3.8.0 release
+- from CFLAGS/CXXFLAGS filter just fortification flags, not arch
+  specific flags
+
 * Tue Aug 07 2012 Mark Wielaard <mjw@redhat.com> 3.8.0-0.1.TEST1.svn12858
 - Update to 3.8.0-TEST1
 - Clear CFLAGS CXXFLAGS LDFLAGS.