diff --git a/ant.spec b/ant.spec
index c7612fe..aec0f54 100644
--- a/ant.spec
+++ b/ant.spec
@@ -329,14 +329,14 @@ Javadoc pour %{name}.
 # Build OPT_JAR_LIST from the contents of /etc/ant.d/
 %patch1 -p1
 
-# fix classpath for java-x.y.z-gcj-compat
+# fix classpath for java-gcj-compat
 if java -version 2>&1 | grep -q "gcj"; then
 %patch2 -p1
 rm -f src/script/ant.orig
 fi
 
-# build the javah task (#157750)
-%patch3 -p1
+# build the javah task (#157750) and make it work with java-gcj-compat
+%patch3 -p1 -b .orig
 
 # clean jar files
 find . -name "*.jar" -exec rm -f {} \;
@@ -627,6 +627,10 @@ fi
 # -----------------------------------------------------------------------------
 
 %changelog
+* Mon Jun  6 2005 Gary Benson <gbenson at redhat.com>
+- Make the javah task fall back to executing javah if
+  com.sun.tools.javah.Main cannot be found.
+
 * Tue May 25 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_9fc
 - Rearrange how BC-compiled stuff is built and installed.