--- ./src/I2C.java.lfarkas	2008-08-01 23:29:24.000000000 +0200
+++ ./src/I2C.java	2008-08-01 23:29:59.000000000 +0200
@@ -35,7 +35,7 @@
 
 	static 
 	{
-		System.loadLibrary( "rxtxI2C" );
+		System.load("@JNIPATH@/" + System.mapLibraryName("rxtxI2C"));
 		Initialize();
 	}
 
--- ./src/RXTXPort.java.lfarkas	2008-08-01 23:30:53.000000000 +0200
+++ ./src/RXTXPort.java	2008-08-01 23:31:16.000000000 +0200
@@ -51,7 +51,7 @@
 
 		if(debug ) 
 			z.reportln( "RXTXPort {}");
-		System.loadLibrary( "rxtxSerial" );
+		System.load("@JNIPATH@/" + System.mapLibraryName("rxtxSerial"));
 		Initialize();
 	}
 
--- ./src/Raw.java.lfarkas	2008-08-01 23:26:50.000000000 +0200
+++ ./src/Raw.java	2008-08-01 23:27:54.000000000 +0200
@@ -32,7 +32,7 @@
 
 	static 
 	{
-		System.loadLibrary( "rxtxRaw" );
+		System.load("@JNIPATH@/" + System.mapLibraryName("rxtxRaw"));
 		Initialize();
 	}
 
--- ./src/RXTXCommDriver.java.lfarkas	2008-08-01 23:31:28.000000000 +0200
+++ ./src/RXTXCommDriver.java	2008-08-01 23:31:59.000000000 +0200
@@ -42,7 +42,7 @@
 	static
 	{
 		if(debug ) System.out.println("RXTXCommDriver {}");
-		System.loadLibrary( "rxtxSerial" );
+		System.load("@JNIPATH@/" + System.mapLibraryName("rxtxSerial"));
 
 		/*
 		   Perform a crude check to make sure people don't mix
--- ./src/LPRPort.java.lfarkas	2008-08-01 23:28:08.000000000 +0200
+++ ./src/LPRPort.java	2008-08-01 23:28:34.000000000 +0200
@@ -32,7 +32,7 @@
 {
 
 	static {
-		System.loadLibrary( "rxtxParallel" );
+		System.load("@JNIPATH@/" + System.mapLibraryName("rxtxParallel"));
 		Initialize();
 	}
 
--- ./src/RS485.java.lfarkas	2008-08-01 23:25:53.000000000 +0200
+++ ./src/RS485.java	2008-08-01 23:26:31.000000000 +0200
@@ -32,7 +32,7 @@
 
 	static 
 	{
-		System.loadLibrary( "rxtxRS485" );
+		System.load("@JNIPATH@/" + System.mapLibraryName("rxtxRS485"));
 		Initialize();
 	}
 
--- ./src/CommPortIdentifier.java.lfarkas	2008-08-01 23:30:13.000000000 +0200
+++ ./src/CommPortIdentifier.java	2008-08-01 23:30:43.000000000 +0200
@@ -80,7 +80,7 @@
 			if (debug)
 				System.out.println("Have not implemented native_psmisc_report_owner(PortName)); in CommPortIdentifier");
 		}
-		System.loadLibrary( "rxtxSerial" );
+		System.load("@JNIPATH@/" + System.mapLibraryName("rxtxSerial"));
 	}
 	CommPortIdentifier ( String pn, CommPort cp, int pt, CommDriver driver) 
 	{
--- ./src/RXTXVersion.java.lfarkas	2008-08-01 23:28:44.000000000 +0200
+++ ./src/RXTXVersion.java	2008-08-01 23:29:09.000000000 +0200
@@ -36,7 +36,7 @@
 	private static String Version;
 
 	static {
-		System.loadLibrary( "rxtxSerial" );
+		System.load("@JNIPATH@/" + System.mapLibraryName("rxtxSerial"));
 		Version = "RXTX-2.1-7";
 	}
 	/**