diff --git a/build.gradle b/build.gradle
index 3ccf5b9..a2abc19 100644
--- a/build.gradle
+++ b/build.gradle
@@ -79,8 +79,7 @@ libraries {
     }
 	all {
         binaries.withType(SharedLibraryBinary) { binary ->
-			cppCompiler.define 'JXINPUT_EXPORTS'
-			//cppCompiler.args '-Wall'			
+			cppCompiler.define 'JXINPUT_EXPORTS'	
 			cppCompiler.args '-I' + jniHeadersDir
 			if (targetPlatform.operatingSystem.macOsX) {
                 cppCompiler.args '-I', "/System/Library/Frameworks/JavaVM.framework/Headers"
@@ -101,21 +100,69 @@ libraries {
         }
     }
 }
+
+tasks.withType(Upload) {
+	repositories {
+		mavenDeployer {
+			repository(url: uri('.maven'))
+		}
+	}
+}
+
+configurations {
+	jni
+}
+
+def deployer = uploadJni.repositories.mavenDeployer
+
 binaries.withType(SharedLibraryBinary) { binary ->
-    if (buildable) {
-        def builderTask = binary.tasks.builder
-        jar.into("native/${targetPlatform.operatingSystem.name}/${targetPlatform.architecture.name}") {
-                from builderTask.outputFile
-        }
-        jar.dependsOn builderTask
-    }
+	if (!buildable) {
+		return
+	}
+	def variantName = "${targetPlatform.operatingSystem.name}-${targetPlatform.architecture.name}"
+	def taskName = "jar-${variantName}"
+	def nativeJar = project.tasks.findByName(taskName)
+	if (nativeJar == null) {
+		nativeJar = project.task(taskName, type: Jar) {
+			baseName = "${project.archivesBaseName}-$variantName"
+		}
+		artifacts {
+			jni nativeJar
+		}
+		def jniPom = deployer.addFilter(variantName) { artifact, file ->
+			return file == nativeJar.archivePath
+		}
+		jniPom.groupId = project.group
+		jniPom.artifactId = nativeJar.baseName
+		jniPom.version = project.version
+		jniPom.scopeMappings.mappings.clear()
+	}
+	def builderTask = binary.tasks.builder
+	def libraryDirectory = project.group.replace('.', '/') + "/${project.archivesBaseName}/${variantName}"
+	nativeJar.into(libraryDirectory) { from builderTask.outputFile }
+	nativeJar.dependsOn builderTask
 }
 
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
-    from sourceSets.main.java.srcDirs
+def mainPom = uploadArchives.repositories.mavenDeployer.pom
+mainPom.groupId = project.group
+mainPom.artifactId = jar.baseName
+mainPom.version = project.version
+mainPom.scopeMappings.mappings.clear()
+mainPom.withXml { provider ->
+	def node = provider.asNode()
+	def deps = node.appendNode('dependencies')
+	['windows-amd64', 'windows-i386'].each { platform ->
+		def dep = deps.appendNode('dependency')
+		dep.appendNode('groupId', project.group)
+		dep.appendNode('artifactId', "${project.archivesBaseName}-${platform}")
+		dep.appendNode('version', project.version)
+	}
+	def dep = deps.appendNode('dependency')
+	dep.appendNode('groupId', 'com.github.boukefalos')
+	dep.appendNode('artifactId', 'jlibloader')
+	dep.appendNode('version', '0.2')
 }
 
-artifacts {
-    archives sourcesJar
+jar {
+	from sourceSets.main.allSource
 }
\ No newline at end of file
diff --git a/src/main/java/de/hardcode/jxinput/directinput/DirectInputDriver.java b/src/main/java/de/hardcode/jxinput/directinput/DirectInputDriver.java
index 558f7d8..f4e4756 100644
--- a/src/main/java/de/hardcode/jxinput/directinput/DirectInputDriver.java
+++ b/src/main/java/de/hardcode/jxinput/directinput/DirectInputDriver.java
@@ -10,6 +10,8 @@ package de.hardcode.jxinput.directinput;
 
 import java.lang.reflect.Array;
 
+import com.github.boukefalos.jlibloader.Native;
+
 /**
  * DirectInputDriver: the connection to the Win32 joystick.
  * There is only one allowed, so the layout of this class is merely static.
@@ -44,9 +46,7 @@ class DirectInputDriver
 	{
 		try
 		{
-			// Load the native lib.
-			System.loadLibrary( NATIVE_LIB_NAME );
-			
+			Native.load("com.github.boukefalos", "jlibxinput");
             init();
 		}
 		catch( SecurityException e )