diff --git a/build.xml b/build.xml
index 41ceb45..51ca800 100644
--- a/build.xml
+++ b/build.xml
@@ -24,6 +24,11 @@
             <os family="windows" />
         </condition>
         
+        <!-- If we are running in linux, set linux property to true -->
+        <condition property="linux" >
+            <!--<os family="unix" />-->
+            <os name="linux" />
+        </condition>
     </target>
 
     <target name="core" depends="init">
@@ -40,15 +45,23 @@
          <ant dir="plugins/DX8" /> 
     </target>
 
+    <target name="linux_plugin" depends="core" if="linux" >
+        <!-- Both srcdir and destdir should be package roots. -->
+        <!-- They could be different of course; in that case NetBeans can also be set -->
+        <!-- up to compile to a different filesystem in the same way; see Compiler Types: -->
+         <ant dir="plugins/linux" /> 
+    </target>
+
     <target name="javadoc" depends="init">
         <!-- Both srcdir and destdir should be package roots. -->
         <!-- They could be different of course; in that case NetBeans can also be set -->
         <!-- up to compile to a different filesystem in the same way; see Compiler Types: -->
         <ant dir="coreAPI" target="javadoc"/>
         <ant dir="plugins/DX8" target="javadoc"/>
+        <ant dir="plugins/linux" target="javadoc"/>
     </target>
     
-    <target name="compile" depends="core,windows_plugin" />
+    <target name="compile" depends="core,windows_plugin,linux_plugin" />
     
     <target name="all" depends="init,compile" description="Build everything.">
         <echo message="Application built. Hello ${hello}!"/>
@@ -56,6 +69,7 @@
     
     <target name="clean" depends="init" description="Clean all build products.">
         <ant dir="plugins/DX8" target="clean"/>
+        <ant dir="plugins/linux" target="clean"/>
         <ant dir="coreAPI" target="clean"/>
     </target>
     
diff --git a/coreAPI/build.xml b/coreAPI/build.xml
index f2db003..01a9053 100644
--- a/coreAPI/build.xml
+++ b/coreAPI/build.xml
@@ -48,14 +48,14 @@
         <!--    Manifest-Version: 1.0 -->
         <!--    Main-Class: com.foo.Main -->
         <!-- 3. Pass to <jar>: manifest="myapp.mf" -->
-        <jar jarfile="bin/controller.jar" compress="true" basedir="classes">
+        <jar jarfile="bin/jinput.jar" compress="true" basedir="classes">
             <include name="net/**"/>
             <exclude name="**/*.java"/>
             <exclude name="**/*.form"/>
             <exclude name="myapp.mf"/>
             <exclude name="myapp.jar"/>
         </jar>
-         <copy file="bin/controller.jar" todir="../plugins/DX8/lib" />
+         <copy file="bin/jinput.jar" todir="../plugins/DX8/lib" />
     </target>
 
     <target name="all" depends="init,jar" description="Build everything.">
@@ -66,7 +66,7 @@
         <java classname="net.java.games.input.test.ControllerTextTest" 
               fork="true" failonerror="true" dir="src/tests">
             <classpath>
-                <pathelement location="bin/controller.jar"/>
+                <pathelement location="bin/jinput.jar"/>
                 <pathelement location="${utils}"/>
             </classpath>
             <!-- Pass some args, perhaps: -->
@@ -79,7 +79,7 @@
         <java classname="net.java.games.input.test.ControllerReadTest" 
               fork="true" failonerror="true" dir="src/tests">
             <classpath>
-                <pathelement location="bin/controller.jar"/>
+                <pathelement location="bin/jinput.jar"/>
                 <pathelement location="${utils}"/>
             </classpath>
             <!-- Pass some args, perhaps: -->
@@ -108,9 +108,9 @@
                 <include name="**/*.class"/>
             </fileset>
         </delete>
-    <delete file="bin/controller.jar"/>
+    <delete file="bin/jinput.jar"/>
     <delete dir="apidocs"/>
-    <delete file="../plugins/DX8/lib/controller.jar" />
+    <delete file="../plugins/DX8/lib/jinput.jar" />
     </target>
 
 </project>
diff --git a/plugins/DX8/build.xml b/plugins/DX8/build.xml
index 1bc1697..9284ba3 100644
--- a/plugins/DX8/build.xml
+++ b/plugins/DX8/build.xml
@@ -29,7 +29,7 @@
         <javac srcdir="src/java" destdir="classes" debug="true" deprecation="true" source="1.4">
             <!-- To add something to the classpath: -->
             <classpath>
-                <pathelement location="lib/controller.jar"/>
+                <pathelement location="lib/jinput.jar"/>
                 <pathelement location="lib/jutils.jar"/>
             </classpath>
             <!-- To exclude some files: -->
@@ -81,7 +81,7 @@
                 <pathelement location="src/java"/>
             </sourcepath>
              <classpath>
-                <pathelement location="lib/controller.jar"/>
+                <pathelement location="lib/jinput.jar"/>
                 <pathelement location="lib/jutils.jar"/>
             </classpath>
         </javadoc>
diff --git a/plugins/linux/build.xml b/plugins/linux/build.xml
index 2666233..e4ec87b 100644
--- a/plugins/linux/build.xml
+++ b/plugins/linux/build.xml
@@ -10,7 +10,7 @@
     <target depends="init" name="compile">
         <javac debug="true" deprecation="true" destdir="classes" source="1.4" srcdir="src/java">
             <classpath>
-                <pathelement location="../../coreAPI/bin/controller.jar"/>
+                <pathelement location="../../coreAPI/bin/jinput.jar"/>
                 <pathelement location="../../coreAPI/lib/jutils.jar"/>
             </classpath>
         </javac>
@@ -39,7 +39,7 @@
                 <pathelement location="src/java"/>
             </sourcepath>
              <classpath>
-                <pathelement location="../../coreAPI/bin/controller.jar"/>
+                <pathelement location="../../coreAPI/bin/jinput.jar"/>
                 <pathelement location="../../coreAPI/lib/jutils.jar"/>
             </classpath>
         </javadoc>
@@ -62,7 +62,7 @@
         <javah>
             <classpath>
                 <pathelement path="src/java"/>
-                <pathelement location="controller.jar"/>
+                <pathelement location="jinput.jar"/>
             </classpath>
             <class name="net.java.games.input.LinuxDevice"/>
             <class name="net.java.games.input.LinuxEnvironmentPlugin"/>
diff --git a/plugins/linux/src/native/build.xml b/plugins/linux/src/native/build.xml
index 9583501..5e82efe 100644
--- a/plugins/linux/src/native/build.xml
+++ b/plugins/linux/src/native/build.xml
@@ -32,7 +32,7 @@
         <javah>
             <classpath>
                 <pathelement path="."/>
-                <pathelement location="controller.jar"/>
+                <pathelement location="jinput.jar"/>
             </classpath>
             <class name="net.java.games.input.LinuxDevice"/>
             <class name="net.java.games.input.LinuxEnvironmentPlugin"/>