diff --git a/LibusbJava/LibusbJava.cpp b/LibusbJava/LibusbJava.cpp
index 5a95add..ffb6b73 100644
--- a/LibusbJava/LibusbJava.cpp
+++ b/LibusbJava/LibusbJava.cpp
@@ -2,7 +2,7 @@
  * 2005/2006
  * Interstate University of Applied Sciences of Technology Buchs NTB
  * Computer Science Laboratory, inf.ntb.ch
- * Andreas Schläpfer, aschlaepfer@ntb.ch
+ * Andreas Schl�pfer, aschlaepfer@ntb.ch
  * 
  * Version 00.02.00
  */
@@ -11,8 +11,8 @@
 #include <stddef.h>
 #include <string.h>
 #include <locale.h>
+#include <usb.h>
 #include "LibusbJava.h"
-#include "usb.h"
 
 //#define DEBUGON
 
diff --git a/LibusbJava/build.xml b/LibusbJava/build.xml
index 655966d..8fdf4db 100644
--- a/LibusbJava/build.xml
+++ b/LibusbJava/build.xml
@@ -70,10 +70,10 @@
 	<target name="linux" depends="clean" description="--> Build ${build.shlib.linux.shlibname}">
 		<exec dir="." executable="${build.win.compiler}">
 			<arg value="-shared" />
-			<arg value="-Wl,-soname,lib${build.shlib.linux.shlibname}" />
+			<arg value="-Wl,-soname,${build.shlib.linux.shlibname}" />
 			<arg value="-I${build.linux.includes}" />
-			<arg value="-mwindows" />
 			<arg value="-shared" />
+			<arg value="${build.shlib.srcname}" />
 			<arg value="-o${build.shlib.linux.shlibname}.${version.linux}" />
 			<arg value="${build.linux.includes}/${build.lib.libusb}" />
 			<arg value="${build.linux.includes}/${build.lib.libusbpp}" />