diff --git a/build.gradle b/build.gradle
index 547fc6b..b817911 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,8 +17,8 @@ dependencies {
 
 group = 'com.github.boukefalos'
 project.archivesBaseName = 'jlibusb'
-version = '0.5.7'
-def jniVersion = '0.2.3.0'
+version = '0.5.8'
+def jniVersion = '0.2.3.1'
 
 task wrapper(type: Wrapper) {
     gradleVersion = '1.12'
@@ -56,7 +56,7 @@ model {
         libs(PrebuiltLibraries) {
             usb { lib ->
                 binaries.withType(StaticLibraryBinary) {
-                    staticLibraryFile = file("lib/${targetPlatform.name}/libusb-1.0.dll.a")
+                    staticLibraryFile = file("lib/${targetPlatform.name}/libusb-1.0.dll")
                 }
             }
         }
@@ -74,7 +74,7 @@ task jniHeaders(dependsOn: compileJava) {
         args '-o', outputFile
         args '-classpath', sourceSets.main.output.classesDir
         args '-classpath', file("$buildDir/../bin")
-        args 'ch.ntb.usb.LibusbJava1'
+        args 'ch.ntb.usb.LibusbJava'
     }
 }
 
@@ -91,7 +91,6 @@ libraries {
             tasks.withType(CppCompile) { task ->
                 task.dependsOn jniHeaders
             }
-            
             lib library: 'usb', linkage: 'static'
         }
     }
@@ -135,8 +134,11 @@ binaries.withType(SharedLibraryBinary) { binary ->
     }
     def builderTask = binary.tasks.builder
     def libraryDirectory = project.group.replace('.', '/') + "/${project.archivesBaseName}/${variantName}" 
-    nativeJar.into(libraryDirectory) { from builderTask.outputFile }
-    nativeJar.dependsOn builderTask
+    nativeJar.into(libraryDirectory) {
+        from builderTask.outputFile
+        from file("lib/${targetPlatform.name}/libusb0.dll")
+    }
+    // nativeJar.dependsOn builderTask
 }
 
 def mainPom = uploadArchives.repositories.mavenDeployer.pom
diff --git a/lib/windows_amd64/libusb0.dll b/lib/windows_amd64/libusb0.dll
new file mode 100644
index 0000000..f916b08
Binary files /dev/null and b/lib/windows_amd64/libusb0.dll differ
diff --git a/lib/windows_i386/libusb0.dll b/lib/windows_i386/libusb0.dll
new file mode 100644
index 0000000..6e475b9
Binary files /dev/null and b/lib/windows_i386/libusb0.dll differ
diff --git a/src/main/java/ch/ntb/usb/LibusbJava.java b/src/main/java/ch/ntb/usb/LibusbJava.java
index 63e45db..e8d48ce 100644
--- a/src/main/java/ch/ntb/usb/LibusbJava.java
+++ b/src/main/java/ch/ntb/usb/LibusbJava.java
@@ -361,7 +361,8 @@ public class LibusbJava {
     private static native int usb_error_no(int value);
 
     static {
-        Native.load("com.github.boukefalos", "jlibusb");
+    	Native.load("com.github.boukefalos", "jlibusb", "libusb0");
+    	Native.load("com.github.boukefalos", "jlibusb");
 
         // define the error codes
         ERROR_SUCCESS = 0;