diff --git a/.gitignore b/.gitignore
index 0be23c4..2b94c20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /valgrind-3.8.0.tar.bz2
 /valgrind-3.8.1.tar.bz2
 /valgrind-3.9.0.TEST1.tar.bz2
+/valgrind-3.9.0.tar.bz2
diff --git a/sources b/sources
index 39d03a6..bc67358 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c955bdb3f24379e8b225b3da2d1d30a1  valgrind-3.9.0.TEST1.tar.bz2
+0947de8112f946b9ce64764af7be6df2  valgrind-3.9.0.tar.bz2
diff --git a/valgrind-3.9.0-amd64_gen_insn_test.patch b/valgrind-3.9.0-amd64_gen_insn_test.patch
new file mode 100644
index 0000000..c6dec0b
--- /dev/null
+++ b/valgrind-3.9.0-amd64_gen_insn_test.patch
@@ -0,0 +1,21 @@
+commit 56d49b46587a6faffc98662f7d22450df0294019
+Author: tom <tom@a5019735-40e9-0310-863c-91ae7b9d1cf9>
+Date:   Fri Nov 1 10:46:28 2013 +0000
+
+    Clear direction flag after tests on amd64. BZ#326983.
+    
+    
+    git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13709 a5019735-40e9-0310-863c-91ae7b9d1cf9
+
+diff --git a/none/tests/amd64/gen_insn_test.pl b/none/tests/amd64/gen_insn_test.pl
+index 409249e..863e560 100644
+--- a/none/tests/amd64/gen_insn_test.pl
++++ b/none/tests/amd64/gen_insn_test.pl
+@@ -850,6 +850,7 @@ while (<>)
+     }
+ 
+ #    print qq|         \"frstor %$stateargnum\\n\"\n|;
++    print qq|         \"cld\\n\"\n|;
+ 
+     print qq|         :|;
+ 
diff --git a/valgrind-3.9.0-config_h.patch b/valgrind-3.9.0-config_h.patch
deleted file mode 100644
index 47a498f..0000000
--- a/valgrind-3.9.0-config_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- valgrind/include/pub_tool_basics.h.jj	2011-10-26 23:24:32.000000000 +0200
-+++ valgrind/include/pub_tool_basics.h	2011-12-09 17:42:50.828630546 +0100
-@@ -297,7 +297,7 @@ static inline Bool sr_EQ ( SysRes sr1, S
- #define VG_BUGS_TO "www.valgrind.org"
- 
- /* Branch prediction hints. */
--#if defined(__GNUC__)
-+#if defined(__GNUC__) && (__GNUC__ >= 3)
- #  define LIKELY(x)   __builtin_expect(!!(x), 1)
- #  define UNLIKELY(x) __builtin_expect(!!(x), 0)
- #else
diff --git a/valgrind-3.8.1-gdbserver_tests-mcinvoke-ppc64.patch b/valgrind-3.9.0-gdbserver_tests-mcinvoke-ppc64.patch
similarity index 100%
rename from valgrind-3.8.1-gdbserver_tests-mcinvoke-ppc64.patch
rename to valgrind-3.9.0-gdbserver_tests-mcinvoke-ppc64.patch
diff --git a/valgrind-3.8.1-ldso-supp.patch b/valgrind-3.9.0-ldso-supp.patch
similarity index 100%
rename from valgrind-3.8.1-ldso-supp.patch
rename to valgrind-3.9.0-ldso-supp.patch
diff --git a/valgrind.spec b/valgrind.spec
index 11b9b1d..6f35ba0 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -3,7 +3,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: %{?scl_prefix}valgrind
 Version: 3.9.0
-Release: 0.1.TEST1%{?dist}
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.valgrind.org/
@@ -12,9 +12,9 @@ Group: Development/Debuggers
 # Only necessary for RHEL, will be ignored on Fedora
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0: http://www.valgrind.org/downloads/valgrind-%{version}.TEST1.tar.bz2
+Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
 
-# Needs investigation and pushing upstrea
+# Needs investigation and pushing upstream
 Patch1: valgrind-3.9.0-cachegrind-improvements.patch
 
 # KDE#211352 - helgrind races in helgrind's own mythread_wrapper
@@ -23,15 +23,14 @@ Patch2: valgrind-3.9.0-helgrind-race-supp.patch
 # undef st_atime, st_mtime and st_ctime. Unknown why this is (still?) needed.
 Patch3: valgrind-3.9.0-stat_h.patch
 
-# Support really ancient gcc. Check __GNUC__ >= 3 for __builtin_expect.
-Patch4: valgrind-3.9.0-config_h.patch
-
 # Make ld.so supressions slightly less specific.
-Patch5: valgrind-3.8.1-ldso-supp.patch
+Patch4: valgrind-3.9.0-ldso-supp.patch
 
 # On some ppc64 installs these test just hangs
-Patch6: valgrind-3.8.1-gdbserver_tests-mcinvoke-ppc64.patch
+Patch5: valgrind-3.9.0-gdbserver_tests-mcinvoke-ppc64.patch
 
+# KDE#326983 - insn_basic test might crash because of setting DF flag 
+Patch6: valgrind-3.9.0-amd64_gen_insn_test.patch
 
 %ifarch x86_64 ppc64
 # Ensure glibc{,-devel} is installed for both multilib arches
@@ -119,7 +118,7 @@ See the section on Debugging MPI Parallel Programs with Valgrind in the
 Valgrind User Manual for details.
 
 %prep
-%setup -q -n %{?scl:%{pkg_name}}%{!?scl:%{name}}-%{version}.TEST1
+%setup -q -n %{?scl:%{pkg_name}}%{!?scl:%{name}}-%{version}
 
 %patch1 -p1
 %patch2 -p1
@@ -225,6 +224,12 @@ done
 # Make sure no extra CFLAGS leak through, the testsuite sets all flags
 # necessary. See also configure above.
 make %{?_smp_mflags} CFLAGS="" check || :
+
+# Remove and cleanup fake 32-bit libgcc package created in  %%build.
+%ifarch x86_64 ppc64
+rm -rf libgcc
+%endif
+
 echo ===============TESTING===================
 ./close_fds make regtest || :
 # Make sure test failures show up in build.log
@@ -274,6 +279,12 @@ echo ===============END TESTING===============
 %endif
 
 %changelog
+* Fri Nov  1 2013 Mark Wielaard <mjw@redhat.com> - 3.9.0-1
+- Upgrade to valgrind 3.9.0 final.
+- Remove support for really ancient GCCs (valgrind-3.9.0-config_h.patch).
+- Add valgrind-3.9.0-amd64_gen_insn_test.patch.
+- Remove and cleanup fake 32-bit libgcc package.
+
 * Mon Oct 28 2013 Mark Wielaard <mjw@redhat.com> - 3.9.0-0.1.TEST1
 - Upgrade to valgrind 3.9.0.TEST1
 - Remove patches that are now upstream: