diff --git a/plugins/linux/build.xml b/plugins/linux/build.xml
index e0dd782..ccdc209 100644
--- a/plugins/linux/build.xml
+++ b/plugins/linux/build.xml
@@ -5,7 +5,6 @@
 
     <target name="init">
         <mkdir dir="target/natives"/>
-        <mkdir dir="target/generated-sources/natives"/>
     </target>
 
     <target name="createNativeDefinitions.java">
@@ -16,7 +15,7 @@
         </exec>
     </target>
 
-    <target depends="createJNIHeaders" name="compileNativeJinputLib">
+    <target depends="init" name="compileNativeJinputLib">
         <exec executable="uname" outputproperty="hwplatform">
             <arg value="-m"/>
         </exec>
@@ -43,15 +42,4 @@
             <fileset file="target/natives/${libname}"/>
         </apply>
     </target>
-
-    <target depends="init" name="createJNIHeaders">
-		<javah destdir="target/generated-sources/natives">
-            <classpath>
-                <pathelement location="target/classes"/>
-                <pathelement location="../../coreAPI/target/classes"/>
-            </classpath>
-			<class name="net.java.games.input.LinuxEventDevice"/>
-			<class name="net.java.games.input.LinuxJoystickDevice"/>
-		</javah>
-    </target>
 </project>
diff --git a/plugins/linux/pom.xml b/plugins/linux/pom.xml
index 8cfee9c..c3b8d95 100644
--- a/plugins/linux/pom.xml
+++ b/plugins/linux/pom.xml
@@ -27,6 +27,15 @@
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
             </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <compilerArgs>
+                        <arg>-h</arg>
+                        <arg>${project.build.directory}/generated-sources/natives</arg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>