diff --git a/debian/changelog b/debian/changelog
index 9a80cf3..31155ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lwjgl (2.4.2+dfsg-3) unstable; urgency=low
+
+  * Fixes FTBFS on powerpc, armel and sh4. (Closes: #584985)
+  * Removed trailing CRs from patches.
+
+ -- Gabriele Giacone <1o5g4r8o@gmail.com>  Fri, 11 Jun 2010 21:06:59 +0200
+
 lwjgl (2.4.2+dfsg-2) unstable; urgency=low
 
   * Fixed clean target. Fixes FTBFS.
diff --git a/debian/patches/00nomacosx b/debian/patches/00nomacosx
index 2431eef..b855740 100644
--- a/debian/patches/00nomacosx
+++ b/debian/patches/00nomacosx
@@ -1,179 +1,99 @@
 Description: Removes references to macosx-related classes.
 Author: Gabriele Giacone <1o5g4r8o@gmail.com>
 
---- a/build.xml
-+++ b/build.xml
-@@ -234,7 +234,7 @@
- 			<class name="org.lwjgl.opengl.WindowsContextImplementation" />
\ No newline at end of file
-
- 		</javah>
\ No newline at end of file
-
- 		
\ No newline at end of file
-
--		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">
\ No newline at end of file
-
-+<!--		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">
\ No newline at end of file
-
- 			<class name="org.lwjgl.MacOSXSysImplementation" />
\ No newline at end of file
-
- 			<class name="org.lwjgl.opengl.MacOSXMouseEventQueue" />
\ No newline at end of file
-
- 			<class name="org.lwjgl.opengl.MacOSXCanvasPeerInfo" />
\ No newline at end of file
-
-@@ -242,7 +242,7 @@
- 			<class name="org.lwjgl.opengl.MacOSXPbufferPeerInfo" />
\ No newline at end of file
-
- 			<class name="org.lwjgl.opengl.MacOSXDisplay" />
\ No newline at end of file
-
- 			<class name="org.lwjgl.opengl.MacOSXContextImplementation" />
\ No newline at end of file
-
--		</javah>
\ No newline at end of file
-
-+		</javah>	-->
\ No newline at end of file
-
- 		
\ No newline at end of file
-
- 		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}" force="yes">
\ No newline at end of file
-
- 			<class name="org.lwjgl.opengl.AWTSurfaceLock" />
\ No newline at end of file
-
-@@ -298,13 +298,13 @@
- 				</tokenfilter>
\ No newline at end of file
-
- 			</filterchain>
\ No newline at end of file
-
- 		</loadfile>				
\ No newline at end of file
-
--		<loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version">
\ No newline at end of file
-
-+<!--		<loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version">
\ No newline at end of file
-
- 			<filterchain>
\ No newline at end of file
-
- 				<tokenfilter>
\ No newline at end of file
-
- 	    		<containsstring contains="#define org_lwjgl_MacOSXSysImplementation_JNI_VERSION"/>
\ No newline at end of file
-
- 				</tokenfilter>
\ No newline at end of file
-
- 			</filterchain>
\ No newline at end of file
-
--		</loadfile>
\ No newline at end of file
-
-+		</loadfile>	-->
\ No newline at end of file
-
- 		<echo>
\ No newline at end of file
-
- 			lwjgl.java.windows.version = ${lwjgl.java.windows.version}
\ No newline at end of file
-
- 			lwjgl.native.windows.version = ${lwjgl.native.windows.version}			
\ No newline at end of file
-
---- a/platform_build/build-applet.xml
-+++ b/platform_build/build-applet.xml
-@@ -1,7 +1,7 @@
- <project name="applet">
\ No newline at end of file
-
- 
\ No newline at end of file
-
- 	<!-- Create our packer task -->
\ No newline at end of file
-
--	<taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/>
\ No newline at end of file
-
-+<!--	<taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/>	-->
\ No newline at end of file
-
- 
\ No newline at end of file
-
- 	<target name="applet" depends="all">
\ No newline at end of file
-
- 		<antcall target="-applet">
\ No newline at end of file
-
---- a/src/java/org/lwjgl/MacOSXSysImplementation.java
-+++ b/src/java/org/lwjgl/MacOSXSysImplementation.java
-@@ -33,7 +33,7 @@ package org.lwjgl;
- 
\ No newline at end of file
-
- import java.awt.Toolkit;
\ No newline at end of file
-
- 
\ No newline at end of file
-
--import com.apple.eio.FileManager;
\ No newline at end of file
-
-+//import com.apple.eio.FileManager;
\ No newline at end of file
-
- 
\ No newline at end of file
-
- /**
\ No newline at end of file
-
-  *
\ No newline at end of file
-
-@@ -55,7 +55,7 @@ final class MacOSXSysImplementation extends J2SESysImplementation {
- 
\ No newline at end of file
-
- 	public boolean openURL(String url) {
\ No newline at end of file
-
- 		try {
\ No newline at end of file
-
--			FileManager.openURL(url);
\ No newline at end of file
-
-+//			FileManager.openURL(url);
\ No newline at end of file
-
- 			return true;
\ No newline at end of file
-
- 		} catch (Exception e) {
\ No newline at end of file
-
- 			LWJGLUtil.log("Exception occurred while trying to invoke browser: " + e);
\ No newline at end of file
-
---- a/src/java/org/lwjgl/opengl/MacOSXDisplay.java
-+++ b/src/java/org/lwjgl/opengl/MacOSXDisplay.java
-@@ -54,9 +54,9 @@ import org.lwjgl.BufferUtils;
- import org.lwjgl.LWJGLException;
\ No newline at end of file
-
- import org.lwjgl.LWJGLUtil;
\ No newline at end of file
-
- 
\ No newline at end of file
-
--import com.apple.eawt.Application;
\ No newline at end of file
-
--import com.apple.eawt.ApplicationAdapter;
\ No newline at end of file
-
--import com.apple.eawt.ApplicationEvent;
\ No newline at end of file
-
-+//import com.apple.eawt.Application;
\ No newline at end of file
-
-+//import com.apple.eawt.ApplicationAdapter;
\ No newline at end of file
-
-+//import com.apple.eawt.ApplicationEvent;
\ No newline at end of file
-
- 
\ No newline at end of file
-
- final class MacOSXDisplay implements DisplayImplementation {
\ No newline at end of file
-
- 	private static final int PBUFFER_HANDLE_SIZE = 24;
\ No newline at end of file
-
-@@ -77,11 +77,11 @@ final class MacOSXDisplay implements DisplayImplementation {
- 		try {
\ No newline at end of file
-
- 			AccessController.doPrivileged(new PrivilegedExceptionAction() {
\ No newline at end of file
-
- 				public Object run() throws Exception {
\ No newline at end of file
-
--					Application.getApplication().addApplicationListener(new ApplicationAdapter() {
\ No newline at end of file
-
-+/*					Application.getApplication().addApplicationListener(new ApplicationAdapter() {
\ No newline at end of file
-
- 						public final void handleQuit(ApplicationEvent event) {
\ No newline at end of file
-
- 							doHandleQuit();
\ No newline at end of file
-
- 						}
\ No newline at end of file
-
--					});
\ No newline at end of file
-
-+					});	*/
\ No newline at end of file
-
- 					return null;
\ No newline at end of file
-
- 				}
\ No newline at end of file
-
- 			});
\ No newline at end of file
-
+--- a/build.xml
++++ b/build.xml
+@@ -234,7 +234,7 @@
+ 			<class name="org.lwjgl.opengl.WindowsContextImplementation" />
+ 		</javah>
+ 		
+-		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">
++<!--		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.native}/macosx" force="yes">
+ 			<class name="org.lwjgl.MacOSXSysImplementation" />
+ 			<class name="org.lwjgl.opengl.MacOSXMouseEventQueue" />
+ 			<class name="org.lwjgl.opengl.MacOSXCanvasPeerInfo" />
+@@ -242,7 +242,7 @@
+ 			<class name="org.lwjgl.opengl.MacOSXPbufferPeerInfo" />
+ 			<class name="org.lwjgl.opengl.MacOSXDisplay" />
+ 			<class name="org.lwjgl.opengl.MacOSXContextImplementation" />
+-		</javah>
++		</javah>	-->
+ 		
+ 		<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}" force="yes">
+ 			<class name="org.lwjgl.opengl.AWTSurfaceLock" />
+@@ -298,13 +298,13 @@
+ 				</tokenfilter>
+ 			</filterchain>
+ 		</loadfile>				
+-		<loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version">
++<!--		<loadfile srcfile="${lwjgl.src.native}/macosx/org_lwjgl_MacOSXSysImplementation.h" property="lwjgl.native.macosx.version">
+ 			<filterchain>
+ 				<tokenfilter>
+ 	    		<containsstring contains="#define org_lwjgl_MacOSXSysImplementation_JNI_VERSION"/>
+ 				</tokenfilter>
+ 			</filterchain>
+-		</loadfile>
++		</loadfile>	-->
+ 		<echo>
+ 			lwjgl.java.windows.version = ${lwjgl.java.windows.version}
+ 			lwjgl.native.windows.version = ${lwjgl.native.windows.version}			
+--- a/platform_build/build-applet.xml
++++ b/platform_build/build-applet.xml
+@@ -1,7 +1,7 @@
+ <project name="applet">
+ 
+ 	<!-- Create our packer task -->
+-	<taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/>
++<!--	<taskdef name="pack200" classname="com.sun.tools.apache.ant.pack200.Pack200Task" classpath="platform_build/Pack200Task.jar"/>	-->
+ 
+ 	<target name="applet" depends="all">
+ 		<antcall target="-applet">
+--- a/src/java/org/lwjgl/MacOSXSysImplementation.java
++++ b/src/java/org/lwjgl/MacOSXSysImplementation.java
+@@ -33,7 +33,7 @@
+ 
+ import java.awt.Toolkit;
+ 
+-import com.apple.eio.FileManager;
++//import com.apple.eio.FileManager;
+ 
+ /**
+  *
+@@ -55,7 +55,7 @@
+ 
+ 	public boolean openURL(String url) {
+ 		try {
+-			FileManager.openURL(url);
++//			FileManager.openURL(url);
+ 			return true;
+ 		} catch (Exception e) {
+ 			LWJGLUtil.log("Exception occurred while trying to invoke browser: " + e);
+--- a/src/java/org/lwjgl/opengl/MacOSXDisplay.java
++++ b/src/java/org/lwjgl/opengl/MacOSXDisplay.java
+@@ -54,9 +54,9 @@
+ import org.lwjgl.LWJGLException;
+ import org.lwjgl.LWJGLUtil;
+ 
+-import com.apple.eawt.Application;
+-import com.apple.eawt.ApplicationAdapter;
+-import com.apple.eawt.ApplicationEvent;
++//import com.apple.eawt.Application;
++//import com.apple.eawt.ApplicationAdapter;
++//import com.apple.eawt.ApplicationEvent;
+ 
+ final class MacOSXDisplay implements DisplayImplementation {
+ 	private static final int PBUFFER_HANDLE_SIZE = 24;
+@@ -77,11 +77,11 @@
+ 		try {
+ 			AccessController.doPrivileged(new PrivilegedExceptionAction() {
+ 				public Object run() throws Exception {
+-					Application.getApplication().addApplicationListener(new ApplicationAdapter() {
++/*					Application.getApplication().addApplicationListener(new ApplicationAdapter() {
+ 						public final void handleQuit(ApplicationEvent event) {
+ 							doHandleQuit();
+ 						}
+-					});
++					});	*/
+ 					return null;
+ 				}
+ 			});
diff --git a/debian/patches/01allarchs b/debian/patches/01allarchs
index 142c46b..3faa8c5 100644
--- a/debian/patches/01allarchs
+++ b/debian/patches/01allarchs
@@ -1,82 +1,74 @@
-Description: To build on all archs
-Author: Gabriele Giacone <1o5g4r8o@gmail.com>
-
---- a/platform_build/linux_ant/build.xml
-+++ b/platform_build/linux_ant/build.xml
-@@ -1,17 +1,22 @@
- <?xml version="1.0"?>
- 
- <project name="lwjgl native code, linux" basedir="../../bin/lwjgl" default="compile">
-+	<exec executable="/usr/bin/dpkg-architecture" outputproperty="arch">
-+		<arg value="-qDEB_BUILD_ARCH"/>
-+	</exec>
- 	<property name="native" location="../../src/native"/>
- 	<property name="libname32" value="liblwjgl.so"/>
- 	<property name="libname64" value="liblwjgl64.so"/>
- 	<property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt" />
- 	<property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/amd64 -ljawt" />
-+	<property name="libs" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/${arch} -ljawt" />
- 	<property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/>
- 
- 	<target name="clean">
- 		<delete>
- 			<fileset dir="x32"/>
- 			<fileset dir="x64"/>
-+			<fileset dir="deb"/>
- 			<fileset dir="." includes="*.o"/>
- 			<fileset dir="." includes="*.so"/>
- 		</delete>
-@@ -41,6 +46,7 @@
- 
- 		<property name="linker_flags32" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs32} ${xf86vm_lib}"/>
- 		<property name="linker_flags64" value="${version_script_flags64} -shared -O2 -Wall -o ${libname64} ${libs64} ${xf86vm_lib}"/>
-+		<property name="linker_flagsdeb" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs} ${xf86vm_lib}"/>
- 
-     	<condition property="build.32bit.only">
-     		<not>
-@@ -58,9 +64,12 @@
-     			<equals arg1="${hwplatform}" arg2="x86_64"/>
-     		</and>
-     	</condition>
-+
-+    	<condition property="build.debian">
-+    			<os name="Linux"/>
-+    	</condition>
-     	
--    	<antcall target="compile32"/>
--    	<antcall target="compile64"/>
-+    	<antcall target="compiledeb"/>
-     </target>
- 	
-     <target name="compile32" unless="build.64bit.only">
-@@ -114,4 +123,30 @@
- 			<fileset file="${libname64}"/>
- 		</apply>
-     </target>
-+
-+    <target name="compiledeb">    	
-+    	<mkdir dir="deb"/>
-+    	<apply dir="deb" executable="gcc" skipemptyfilesets="true" failonerror="true">
-+			<arg line="${cflags32} ${cflags_pthread}"/>
-+			<arg value="-I${java.home}/include"/>
-+			<arg value="-I${java.home}/include/linux"/>
-+			<arg value="-I${java.home}/../include"/>
-+			<arg value="-I${java.home}/../include/linux"/>
-+			<arg value="-I${java.home}/../include/solaris"/>
-+			<arg value="-I${native}/common"/>
-+			<arg value="-I${native}/linux"/>
-+			<mapper type="glob" from="*.c" to="*.o"/>
-+			<fileset dir="${native}/linux" includes="*.c"/>
-+			<fileset dir="${native}/generated" includes="*.c"/>
-+			<fileset dir="${native}/common" includes="*.c"/>
-+		</apply>
-+		<apply dir="." parallel="true" executable="gcc" failonerror="true">
-+			<srcfile/>
-+			<arg line="${linker_flagsdeb}"/>
-+			<fileset dir="deb" includes="*.o"/>
-+		</apply>
-+		<apply dir="." parallel="true" executable="strip" failonerror="true">
-+			<fileset file="${libname32}"/>
-+		</apply>
-+    </target>
- </project>
+Description: To build on all archs
+Author: Gabriele Giacone <1o5g4r8o@gmail.com>
+
+--- a/platform_build/linux_ant/build.xml
++++ b/platform_build/linux_ant/build.xml
+@@ -6,12 +6,14 @@
+ 	<property name="libname64" value="liblwjgl64.so"/>
+ 	<property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lpthread -L${java.home}/lib/i386 -ljawt" />
+ 	<property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/amd64 -ljawt" />
++	<property name="libs" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lXcursor -lXrandr -lXxf86vm -lpthread -L${java.home}/lib/${os.arch} -ljawt" />
+ 	<property name="cflags32" value="-O2 -Wall -c -fPIC -std=c99 -Wunused"/>
+ 
+ 	<target name="clean">
+ 		<delete>
+ 			<fileset dir="x32"/>
+ 			<fileset dir="x64"/>
++			<fileset dir="deb"/>
+ 			<fileset dir="." includes="*.o"/>
+ 			<fileset dir="." includes="*.so"/>
+ 		</delete>
+@@ -41,6 +43,7 @@
+ 
+ 		<property name="linker_flags32" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs32} ${xf86vm_lib}"/>
+ 		<property name="linker_flags64" value="${version_script_flags64} -shared -O2 -Wall -o ${libname64} ${libs64} ${xf86vm_lib}"/>
++		<property name="linker_flagsdeb" value="${version_script_flags32} -shared -O2 -Wall -o ${libname32} ${libs} ${xf86vm_lib}"/>
+ 
+     	<condition property="build.32bit.only">
+     		<not>
+@@ -58,9 +61,12 @@
+     			<equals arg1="${hwplatform}" arg2="x86_64"/>
+     		</and>
+     	</condition>
++
++    	<condition property="build.debian">
++    			<os name="Linux"/>
++    	</condition>
+     	
+-    	<antcall target="compile32"/>
+-    	<antcall target="compile64"/>
++    	<antcall target="compiledeb"/>
+     </target>
+ 	
+     <target name="compile32" unless="build.64bit.only">
+@@ -114,4 +120,30 @@
+ 			<fileset file="${libname64}"/>
+ 		</apply>
+     </target>
++
++    <target name="compiledeb">    	
++    	<mkdir dir="deb"/>
++    	<apply dir="deb" executable="gcc" skipemptyfilesets="true" failonerror="true">
++			<arg line="${cflags32} ${cflags_pthread}"/>
++			<arg value="-I${java.home}/include"/>
++			<arg value="-I${java.home}/include/linux"/>
++			<arg value="-I${java.home}/../include"/>
++			<arg value="-I${java.home}/../include/linux"/>
++			<arg value="-I${java.home}/../include/solaris"/>
++			<arg value="-I${native}/common"/>
++			<arg value="-I${native}/linux"/>
++			<mapper type="glob" from="*.c" to="*.o"/>
++			<fileset dir="${native}/linux" includes="*.c"/>
++			<fileset dir="${native}/generated" includes="*.c"/>
++			<fileset dir="${native}/common" includes="*.c"/>
++		</apply>
++		<apply dir="." parallel="true" executable="gcc" failonerror="true">
++			<srcfile/>
++			<arg line="${linker_flagsdeb}"/>
++			<fileset dir="deb" includes="*.o"/>
++		</apply>
++		<apply dir="." parallel="true" executable="strip" failonerror="true">
++			<fileset file="${libname32}"/>
++		</apply>
++    </target>
+ </project>
diff --git a/debian/patches/02systemjinput b/debian/patches/02systemjinput
index 60e4672..bd80ced 100644
--- a/debian/patches/02systemjinput
+++ b/debian/patches/02systemjinput
@@ -1,39 +1,23 @@
 Description: To find system jinput libraries
 Author: Gabriele Giacone <1o5g4r8o@gmail.com>
 
---- a/build.xml
-+++ b/build.xml
-@@ -340,7 +340,7 @@
- 	
\ No newline at end of file
-
- 	<!-- Compiles the Java source code -->
\ No newline at end of file
-
- 	<target name="compile" description="Compiles the java source code" depends="-initialize">
\ No newline at end of file
-
--		<javac debug="yes" destdir="${lwjgl.bin}" source="1.4" target="1.4" classpath="${lwjgl.lib}/jinput.jar:${lwjgl.lib}/AppleJavaExtensions.jar" taskname="core">
\ No newline at end of file
-
-+		<javac debug="yes" destdir="${lwjgl.bin}" source="1.4" target="1.4" classpath="/usr/share/java/jinput.jar:/usr/share/java/jutils.jar:${lwjgl.lib}/AppleJavaExtensions.jar" taskname="core">
\ No newline at end of file
-
- 			<src path="${lwjgl.src}/java/"/>
\ No newline at end of file
-
- 			<src path="${lwjgl.src}/generated/"/>
\ No newline at end of file
-
- 			<include name="org/lwjgl/*.java"/>
\ No newline at end of file
-
-@@ -481,7 +481,7 @@
- 			<os name="Mac OS X" />
\ No newline at end of file
-
- 		</condition>
\ No newline at end of file
-
- 		<property name="native_path_expanded" location="${native_path}"/>
\ No newline at end of file
-
--		<java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:${lwjgl.lib}/jinput.jar" fork="true">
\ No newline at end of file
-
-+		<java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:/usr/share/java/jinput.jar:/usr/share/java/jutils.jar" fork="true">
\ No newline at end of file
-
- 			<sysproperty key="org.lwjgl.util.Debug" value="true"/>
\ No newline at end of file
-
- 			<sysproperty key="java.library.path" value="${native_path_expanded}"/>
\ No newline at end of file
-
- 			<arg line="${args}"/>
\ No newline at end of file
-
+--- a/build.xml
++++ b/build.xml
+@@ -340,7 +340,7 @@
+ 	
+ 	<!-- Compiles the Java source code -->
+ 	<target name="compile" description="Compiles the java source code" depends="-initialize">
+-		<javac debug="yes" destdir="${lwjgl.bin}" source="1.4" target="1.4" classpath="${lwjgl.lib}/jinput.jar:${lwjgl.lib}/AppleJavaExtensions.jar" taskname="core">
++		<javac debug="yes" destdir="${lwjgl.bin}" source="1.4" target="1.4" classpath="/usr/share/java/jinput.jar:/usr/share/java/jutils.jar:${lwjgl.lib}/AppleJavaExtensions.jar" taskname="core">
+ 			<src path="${lwjgl.src}/java/"/>
+ 			<src path="${lwjgl.src}/generated/"/>
+ 			<include name="org/lwjgl/*.java"/>
+@@ -481,7 +481,7 @@
+ 			<os name="Mac OS X" />
+ 		</condition>
+ 		<property name="native_path_expanded" location="${native_path}"/>
+-		<java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:${lwjgl.lib}/jinput.jar" fork="true">
++		<java classname="${test.mainclass}" classpath="res:${lwjgl.lib}/lwjgl.jar:${lwjgl.lib}/lwjgl_util.jar:${lwjgl.lib}/lwjgl_test.jar:/usr/share/java/jinput.jar:/usr/share/java/jutils.jar" fork="true">
+ 			<sysproperty key="org.lwjgl.util.Debug" value="true"/>
+ 			<sysproperty key="java.library.path" value="${native_path_expanded}"/>
+ 			<arg line="${args}"/>