diff --git a/ant.spec b/ant.spec
index d152458..03d335f 100644
--- a/ant.spec
+++ b/ant.spec
@@ -69,7 +69,7 @@ Source2:        apache-ant-%{major_version}.ant.conf
 # https://www.zarb.org/pipermail/jpackage-discuss/2005-September/008781.html
 # https://www.zarb.org/pipermail/jpackage-discuss/2005-September/008785.html
 # Message-ID: <432A8E37.8050101@zarb.org>
-Patch2:         apache-ant-1.6.5-javah.patch
+Patch2:         apache-ant-1.7.0-javah.patch
 # Fix some places where copies of classes are included in the wrong jarfiles
 Patch4:         apache-ant-jars.patch
 Patch5:         apache-ant-bz163689.patch
diff --git a/apache-ant-1.6.5-javah.patch b/apache-ant-1.6.5-javah.patch
deleted file mode 100644
index 2de15e3..0000000
--- a/apache-ant-1.6.5-javah.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- apache-ant-1.6.5/src/main/org/apache/tools/ant/util/JavaEnvUtils.java.original	2005-10-31 15:05:55.000000000 -0500
-+++ apache-ant-1.6.5/src/main/org/apache/tools/ant/util/JavaEnvUtils.java	2005-10-31 15:11:31.000000000 -0500
-@@ -104,7 +104,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
---- apache-ant-1.6.5/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java.original	2005-10-31 15:06:34.000000000 -0500
-+++ apache-ant-1.6.5/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java	2005-10-31 15:08:13.000000000 -0500
-@@ -52,7 +52,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");
diff --git a/apache-ant-1.7.0-javah.patch b/apache-ant-1.7.0-javah.patch
new file mode 100644
index 0000000..4f45530
--- /dev/null
+++ b/apache-ant-1.7.0-javah.patch
@@ -0,0 +1,22 @@
+--- apache-ant-1.6.5/src/main/org/apache/tools/ant/util/JavaEnvUtils.java.original	2005-10-31 15:05:55.000000000 -0500
++++ apache-ant-1.6.5/src/main/org/apache/tools/ant/util/JavaEnvUtils.java	2005-10-31 15:11:31.000000000 -0500
+@@ -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
+--- apache-ant-1.6.5/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java.original	2005-10-31 15:06:34.000000000 -0500
++++ apache-ant-1.6.5/src/main/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.java	2005-10-31 15:08:13.000000000 -0500
+@@ -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");