diff --git a/abicheck-1.2-test-static.patch b/abicheck-1.2-test-static.patch
deleted file mode 100644
index 28302c8..0000000
--- a/abicheck-1.2-test-static.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Nur abicheck-1.2-orig/test/Makefile abicheck-1.2/test/Makefile
---- abicheck-1.2-orig/test/Makefile	2003-08-26 21:57:51.000000000 +0200
-+++ abicheck-1.2/test/Makefile	2004-12-13 13:01:19.827315472 +0100
-@@ -9,7 +9,7 @@
- # /usr/bin/ld: BFD 2.11.93.0.2 20020207 assertion fail elf-strtab.c:262
- # but it still creates the binary properly.
- libc_a: libc_a.c
--	cc -o libc_a libc_a.c -lm /usr/lib/libc.a
-+	cc -o libc_a libc_a.c -static -lm /usr/lib/libc.a
- 
- private1: private1.c
- 	cc -D`uname` -o private1 private1.c
-diff -Nur abicheck-1.2-orig/test/libc_a.c abicheck-1.2/test/libc_a.c
---- abicheck-1.2-orig/test/libc_a.c	2003-08-26 21:57:51.000000000 +0200
-+++ abicheck-1.2/test/libc_a.c	2007-05-24 11:11:20.000000000 +0200
-@@ -5,6 +5,7 @@
- 
- /* This is used to catch libc.a linking. See Makefile & run_tests */
- 
-+#include <stdio.h>
- #include <stdlib.h>
- #include <math.h>
- 
diff --git a/abicheck-1.2-tests.patch b/abicheck-1.2-tests.patch
new file mode 100644
index 0000000..8765b79
--- /dev/null
+++ b/abicheck-1.2-tests.patch
@@ -0,0 +1,46 @@
+diff -Nur abicheck-1.2-orig/test/Makefile abicheck-1.2/test/Makefile
+--- abicheck-1.2-orig/test/Makefile	2003-08-26 21:57:51.000000000 +0200
++++ abicheck-1.2/test/Makefile	2004-12-13 13:01:19.827315472 +0100
+@@ -9,7 +9,7 @@
+ # /usr/bin/ld: BFD 2.11.93.0.2 20020207 assertion fail elf-strtab.c:262
+ # but it still creates the binary properly.
+ libc_a: libc_a.c
+-	cc -o libc_a libc_a.c -lm /usr/lib/libc.a
++	cc -o libc_a libc_a.c -static -lm /usr/lib/libc.a
+ 
+ private1: private1.c
+ 	cc -D`uname` -o private1 private1.c
+diff -Nur abicheck-1.2-orig/test/libc_a.c abicheck-1.2/test/libc_a.c
+--- abicheck-1.2-orig/test/libc_a.c	2003-08-26 21:57:51.000000000 +0200
++++ abicheck-1.2/test/libc_a.c	2007-05-24 11:11:20.000000000 +0200
+@@ -5,6 +5,7 @@
+ 
+ /* This is used to catch libc.a linking. See Makefile & run_tests */
+ 
++#include <stdio.h>
+ #include <stdlib.h>
+ #include <math.h>
+ 
+diff -Nur abicheck-1.2-orig/test/private1.c abicheck-1.2/test/private1.c
+--- abicheck-1.2-orig/test/private1.c	2002-06-18 20:16:07.000000000 +0200
++++ abicheck-1.2/test/private1.c	2007-05-24 11:40:25.000000000 +0200
+@@ -6,6 +6,7 @@
+ /* This is for simple catching of some private symbol usage. See run_tests */
+ 
+ #include <stdio.h>
++#include <string.h>
+ 
+ #if	defined(SunOS)
+ #define OS "Solaris"
+diff -Nur abicheck-1.2-orig/test/run_tests abicheck-1.2/test/run_tests
+--- abicheck-1.2-orig/test/run_tests	2002-02-07 15:40:20.000000000 +0100
++++ abicheck-1.2/test/run_tests	2007-05-24 11:40:52.000000000 +0200
+@@ -19,7 +19,7 @@
+ # libc_a:
+ 
+ name="libc.a static link test on libc_a"
+-if abicheck ./libc_a 2>/dev/null | grep 'STATIC_LINK:.*libc' > /dev/null; then
++if abicheck ./libc_a 2>/dev/null | grep 'STATIC_LINK:.*\(libc\|completely statically linked\)' > /dev/null; then
+ 	pass
+ else
+ 	fail
diff --git a/abicheck.spec b/abicheck.spec
index 32329c5..1db58bf 100644
--- a/abicheck.spec
+++ b/abicheck.spec
@@ -3,13 +3,13 @@
 Summary: 	ABI checking tool
 Name: 		abicheck
 Version: 	1.2
-Release: 	11.2
+Release: 	12
 License: 	LGPL
 Group: 		Applications/File
 URL: 		http://abicheck.sourceforge.net/
 Source0: 	http://dl.sf.net/abicheck/%{name}-%{version}.tar.gz
 Patch0:		abicheck-1.2-fc3.patch
-Patch1:		abicheck-1.2-test-static.patch
+Patch1:		abicheck-1.2-tests.patch
 Patch2:		abicheck-1.2-bindings-fc4.patch
 Patch3:		abicheck-1.2-libgcc.patch
 Patch4:		abicheck-1.2-fortify-source-fc6.patch
@@ -27,7 +27,7 @@ Binary Interface).
 %prep
 %setup -q
 %patch -p1 -b .fc3
-%patch1 -p1 -b .test-static
+%patch1 -p1 -b .tests
 %patch2 -p1 -b .bindings-fc4
 %patch3 -p1 -b .libgcc
 %patch4 -p1 -b .fortify-source-fc5
@@ -47,7 +47,7 @@ install -p -m 0644 abicheck.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 
 %check
-make test || ./abicheck test/libc_a
+make test
 
 
 %clean
@@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu May 24 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2-12
+- Patch tests a bit more (also fixes ppc64).
+
 * Mon Aug 28 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2-11
 - Rebuild and update fortify-source patch.