--- src/main/org/apache/tools/ant/util/JavaEnvUtils.java.orig	2006-12-13 07:16:19.000000000 -0500
+++ src/main/org/apache/tools/ant/util/JavaEnvUtils.java	2007-07-27 12:59:04.000000000 -0400
@@ -114,7 +114,7 @@
         }
         kaffeDetected = false;
         try {
-            Class.forName("kaffe.util.NotImplemented");
+            Class.forName("gnu.classpath.Configuration");
             kaffeDetected = true;
         } catch (Throwable t) {
             // swallow as this simply doesn't seem to be Kaffe
--- src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java.orig	2006-12-13 07:16:22.000000000 -0500
+++ src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java	2007-07-27 13:00:51.000000000 -0400
@@ -56,7 +56,7 @@
 
     private Commandline setupKaffehCommand(Javah javah) {
         Commandline cmd = new Commandline();
-        cmd.setExecutable(JavaEnvUtils.getJdkExecutable("kaffeh"));
+        cmd.setExecutable(JavaEnvUtils.getJdkExecutable("javah"));
 
         if (javah.getDestdir() != null) {
             cmd.createArgument().setValue("-d");