diff --git a/valgrind.changes b/valgrind.changes
index 4ac8bda..52a4837 100644
--- a/valgrind.changes
+++ b/valgrind.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Jul 26 18:02:35 UTC 2014 - schwab@suse.de
+
+- Fix patch conflicts.
+
 -------------------------------------------------------------------
 Wed Jun 18 15:08:53 UTC 2014 - dmueller@suse.com
 
diff --git a/valgrind.spec b/valgrind.spec
index a441d67..de305c0 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -145,20 +145,21 @@ Authors:
 cd VEX
 %ifarch aarch64
 %patch8
-%endif
+%else
 %patch9
+%endif
 cd ..
 %patch1
-%ifnarch aarch64
+%ifarch aarch64
+%patch7
+%else
 %patch2
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6
-%else
-%patch7
-%endif
 %patch10
+%endif
 
 %build
 %ifarch %arm