--- plugins/linux/src/java/net/java/games/input/LinuxEnvironmentPlugin.java.orig	2011-02-20 15:11:41.234377000 +0100
+++ plugins/linux/src/java/net/java/games/input/LinuxEnvironmentPlugin.java	2011-07-20 08:20:17.725039445 +0200
@@ -42,7 +42,7 @@
  * @author Jeremy Booth (jeremy@newdawnsoftware.com)
  */
 public final class LinuxEnvironmentPlugin extends ControllerEnvironment implements Plugin {
-	private final static String LIBNAME = "jinput-linux";
+	private final static String LIBNAME = "jinput";
 	private final static String POSTFIX64BIT = "64";
 	private static boolean supported = false;
 	
@@ -61,7 +61,7 @@
 		AccessController.doPrivileged(
 				new PrivilegedAction() {
 					public final Object run() {
-						String lib_path = System.getProperty("net.java.games.input.librarypath");
+						String lib_path = System.getProperty("java.library.path");
 						try {
 							if (lib_path != null)
 								System.load(lib_path + File.separator + System.mapLibraryName(lib_name));
@@ -97,12 +97,8 @@
 	static {
 		String osName = getPrivilegedProperty("os.name", "").trim();
 		if(osName.equals("Linux")) {
-            supported = true;
-			if("i386".equals(getPrivilegedProperty("os.arch"))) {
-				loadLibrary(LIBNAME);
-			} else {
-				loadLibrary(LIBNAME + POSTFIX64BIT);
-			}
+			supported = true;
+			loadLibrary(LIBNAME);
 		}
 	}