diff --git a/native/plugin.jelly b/native/plugin.jelly
index 2a78d2b7..a8e8c637 100644
--- a/native/plugin.jelly
+++ b/native/plugin.jelly
@@ -232,6 +232,17 @@
         </j:forEach>
       </j:forEach>
 
+      <!-- Determine classpath to pass to javah -->
+      <j:set var="depclasspath" value=""/>
+      <j:forEach var="lib" items="${pom.artifacts}">
+        <j:set var="dep" value="${lib.dependency}"/>
+        <j:if test="${dep.getProperty('native.ignorejniheader')!='false'}">
+           <j:if test="${dep.type =='jar'}"> 
+             <j:set var="depclasspath" value="${depclasspath}${systemScope.getProperty('path.separator')}${lib.path}"/>
+           </j:if>
+        </j:if>
+      </j:forEach>
+
       <j:if test="${compileJNI == 'true'}">
         <ant:echo>Running Javah on java classes</ant:echo>
         <mkdir dir="${maven.build.dir}/native/jni"/>
@@ -260,7 +271,7 @@
         <property environment="env"/>
         <exec executable="${env.JAVA_HOME}/bin/javah">
           <arg line="-d ${maven.build.dir}/native/jni"/>
-          <arg line="-classpath ${maven.build.dest}"/>
+          <arg line="-classpath ${maven.build.dest}${depclasspath}"/>
       
           <j:forEach var="file" items="${classFiles.iterator()}">
             <j:set var="isNative" value="false"/>
diff --git a/native/xdocs/changes.xml b/native/xdocs/changes.xml
index 628fd3a5..6f17e3d4 100644
--- a/native/xdocs/changes.xml
+++ b/native/xdocs/changes.xml
@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.2-SNAPSHOT" date="in CVS">
+      <action dev="ltheussl" type="fix" issue="MPNATIVE-14" due-to="Marcus Crafter">Add dependency classpath to call to javah.</action>
       <action dev="ltheussl" type="fix" issue="MPNATIVE-13" due-to="baleineca">Jelly tokenize incorrect behaviour.</action>
       <action dev="brett" type="add" due-to="baleineca">Checking for runtime property and adding it.  Default to "dynamic" if not present.</action>
       <action dev="brett" type="fix" issue="MPNATIVE-10" due-to="Joachim Bader">Add DLL support to the plugin</action>
