diff --git a/native/plugin.jelly b/native/plugin.jelly
index f6845793..6e867cc1 100644
--- a/native/plugin.jelly
+++ b/native/plugin.jelly
@@ -108,6 +108,9 @@
       <j:if test="${compileJNI == 'true'}">
         <ant:echo>Running Javah on java classes</ant:echo>
         <mkdir dir="${maven.build.dir}/native/jni"/>
+
+<!--	need ANT 1.6
+
         <javah destdir="${maven.build.dir}/native/jni">
           <classpath>
             <pathelement location="${maven.build.dest}"/>
@@ -124,7 +127,28 @@
               <class name="${clazz.className}"/>
             </j:if>
           </j:forEach>
-        </javah>
+        </javah> -->
+
+	<!--  workaround -->
+	<property environment="env"/>
+	<exec executable="${env.JAVA_HOME}/bin/javah">
+		<arg line="-d ${maven.build.dir}/native/jni"/>
+		<arg line="-classpath ${maven.build.dest}"/>
+
+		<j:forEach var="file" items="${classFiles.iterator()}">
+			<j:set var="isNative" value="false"/>
+			<j:set var="clazz" value="${javaSourceTool.getBcelClass(file.toString())}"/>
+			<j:forEach var="method" items="${clazz.getMethods()}">
+				<j:if test="${method.isNative() == 'true'}">
+					<j:set var="isNative" value="true"/>
+				</j:if>
+			</j:forEach>
+			<j:if test="${isNative == 'true'}">
+				<arg value="${clazz.className}"/>
+			</j:if>
+		</j:forEach>
+	</exec>
+
       </j:if>
     </goal>
 </project>
diff --git a/native/xdocs/changes.xml b/native/xdocs/changes.xml
new file mode 100644
index 00000000..e23a5ed6
--- /dev/null
+++ b/native/xdocs/changes.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- 
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+
+<document>
+  <properties>
+    <title>Changes</title>
+    <author email="brett@apache.org">Brett Porter</author>
+  </properties>
+  <body>
+    <release version="1.1-SNAPSHOT" date="in CVS">
+      <action dev="brett" type="fix" issue="MPNATIVE-1" due-to="Joachim Bader">Help javah work on all JDK features</action>
+    </release>
+  </body>
+</document>
