diff --git a/valgrind-3.8.1-x86_amd64_features-avx.patch b/valgrind-3.8.1-x86_amd64_features-avx.patch
new file mode 100644
index 0000000..49ba8bd
--- /dev/null
+++ b/valgrind-3.8.1-x86_amd64_features-avx.patch
@@ -0,0 +1,11 @@
+--- valgrind/tests/x86_amd64_features.c	2012-07-11 15:30:47.564508460 +0200
++++ valgrind/tests/x86_amd64_features.c	2012-09-23 21:21:40.826638636 +0200
+@@ -123,7 +123,7 @@
+      cmask = 1 << 20;
+    } else if ( strcmp( cpu, "amd64-avx" ) == 0 ) {
+      level = 1;
+-     cmask = (1 << 20) | (1 << 28);
++     cmask = (1 << 27) | (1 << 28); /* osxsave and avx */
+      require_xgetbv = True;
+ #endif
+    } else {
diff --git a/valgrind.spec b/valgrind.spec
index ae6e1c8..3831684 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -55,6 +55,10 @@ Patch13: valgrind-3.8.1-cfi_dw_ops.patch
 # On some ppc64 installs these test just hangs
 Patch14: valgrind-3.8.1-gdbserver_tests-mcinvoke-ppc64.patch
 
+# KDE#307285 - x86_amd64 feature test for avx in test suite is wrong
+# Should test OSXSAVE first before executing XGETBV.
+Patch15: valgrind-3.8.1-x86_amd64_features-avx.patch
+
 
 # KDE#305728 - Add support for AVX2, BMI1, BMI2 and FMA instructions 
 # Combined patch for:
@@ -192,6 +196,7 @@ for details.
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 # Add support for AVX2, BMI1, BMI2 and FMA instructions
 %patch21 -p1
@@ -327,6 +332,9 @@ echo ===============END TESTING===============
 %endif
 
 %changelog
+* Mon Sep 24 2012 Mark Wielaard <mjw@redhat.com>
+- Add valgrind-3.8.1-x86_amd64_features-avx.patch (KDE#307285)
+
 * Fri Sep 20 2012 Mark Wielaard <mjw@redhat.com> 3.8.1-2
 - Add valgrind-3.8.1-gdbserver_tests-mcinvoke-ppc64.patch
 - Replace valgrind-3.8.1-cfi_dw_ops.patch with version as committed upstream.