diff --git a/pom.xml b/pom.xml
index ea5f837..13ac6bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>us.hebi.matlab</groupId>
     <artifactId>input</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
 
     <name>matlab-input</name>
     <description>MATLAB library for joystick and keyboard input</description>
@@ -31,6 +31,9 @@
         <contributor>
             <name>Jonas Withelm</name>
         </contributor>
+        <contributor>
+            <name>Bartek Grochowski</name>
+        </contributor>
     </contributors>
     
     <scm>
@@ -44,11 +47,10 @@
 
         <!-- Dependency versions. KEEP IN ALPHABETICAL ORDER-->
         <junit.version>4.11</junit.version>
-        <jinput.version>2.0.6</jinput.version>
+        <jinput.version>2.0.10</jinput.version>
 
         <!-- Default to minimum Java version compatible with MATLAB >2009a -->
-        <maven.compiler.source>1.6</maven.compiler.source>
-        <maven.compiler.target>1.6</maven.compiler.target>
+        <maven.compiler.release>8</maven.compiler.release>
 
         <!-- Other Properties -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -56,31 +58,11 @@
 
     <dependencies>
 
-        <dependency> <!-- Java Joystick Input -->
+        <dependency> <!-- Java Joystick JNI Binaries -->
             <groupId>net.java.jinput</groupId>
             <artifactId>jinput</artifactId>
             <version>${jinput.version}</version>
-        </dependency>
-
-        <dependency> <!-- Java Joystick JNI Binaries (Windows) -->
-            <groupId>net.java.jinput</groupId>
-            <artifactId>jinput-platform</artifactId>
-            <version>${jinput.version}</version>
-            <classifier>natives-windows</classifier>
-            <scope>provided</scope>
-        </dependency>
-        <dependency> <!-- Java Joystick JNI Binaries (Linux) -->
-            <groupId>net.java.jinput</groupId>
-            <artifactId>jinput-platform</artifactId>
-            <version>${jinput.version}</version>
-            <classifier>natives-linux</classifier>
-            <scope>provided</scope>
-        </dependency>
-        <dependency> <!-- Java Joystick JNI Binaries (Mac OSX) -->
-            <groupId>net.java.jinput</groupId>
-            <artifactId>jinput-platform</artifactId>
-            <version>${jinput.version}</version>
-            <classifier>natives-osx</classifier>
+            <classifier>natives-all</classifier>
             <scope>provided</scope>
         </dependency>
 
@@ -95,7 +77,84 @@
     <build>
         <plugins>
 
-            <plugin> <!-- Builds a jar that includes all runtime dependencies -->
+            <!-- Unpack jinput + platform sources -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.6.1</version>
+                <executions>
+                    <execution>
+                        <id>unpack-jinput-sources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>net.java.jinput</groupId>
+                                    <artifactId>jinput</artifactId>
+                                    <version>${jinput.version}</version>
+                                    <classifier>sources</classifier>
+                                    <outputDirectory>${project.build.directory}/jinput-src</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>net.java.jinput</groupId>
+                                    <artifactId>windows-plugin</artifactId>
+                                    <version>${jinput.version}</version>
+                                    <classifier>sources</classifier>
+                                    <outputDirectory>${project.build.directory}/jinput-src</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>net.java.jinput</groupId>
+                                    <artifactId>linux-plugin</artifactId>
+                                    <version>${jinput.version}</version>
+                                    <classifier>sources</classifier>
+                                    <outputDirectory>${project.build.directory}/jinput-src</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>net.java.jinput</groupId>
+                                    <artifactId>osx-plugin</artifactId>
+                                    <version>${jinput.version}</version>
+                                    <classifier>sources</classifier>
+                                    <outputDirectory>${project.build.directory}/jinput-src</outputDirectory>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>net.java.jinput</groupId>
+                                    <artifactId>awt-plugin</artifactId>
+                                    <version>${jinput.version}</version>
+                                    <classifier>sources</classifier>
+                                    <outputDirectory>${project.build.directory}/jinput-src</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- Add jinput sources to compilation -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.5.0</version>
+                <executions>
+                    <execution>
+                        <id>add-jinput-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${project.build.directory}/jinput-src</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- Shade plugin: bundle everything -->
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>2.4.3</version>
@@ -109,10 +168,16 @@
                 </executions>
                 <configuration>
                     <finalName>${releaseName}</finalName>
+                    <artifactSet>
+                        <excludes>
+                            <exclude>net.java.jinput:jinput</exclude>
+                        </excludes>
+                    </artifactSet>
                 </configuration>
             </plugin>
 
-            <plugin> <!-- Change MATLAB script to reference the correct jar file -->
+            <!-- Replace release name in MATLAB files -->
+            <plugin>
                 <groupId>com.google.code.maven-replacer-plugin</groupId>
                 <artifactId>replacer</artifactId>
                 <version>1.5.2</version>
@@ -139,7 +204,22 @@
                 </configuration>
             </plugin>
 
-            <plugin> <!-- Creates a release zip file-->
+            <plugin>
+                <groupId>com.googlecode.mavennatives</groupId>
+                <artifactId>maven-nativedependencies-plugin</artifactId>
+                <version>0.0.7</version>
+                <executions>
+                    <execution>
+                        <id>unpacknatives</id>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- Creates release zip -->
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>3.0.0</version>
diff --git a/src/main/assembly/release.xml b/src/main/assembly/release.xml
index 27511bf..8c68510 100644
--- a/src/main/assembly/release.xml
+++ b/src/main/assembly/release.xml
@@ -46,8 +46,16 @@
             <unpack>true</unpack>
             <scope>provided</scope>
             <includes>
-                <include>*:jinput-platform:*</include>
+                <include>*:jinput:*</include>
             </includes>
         </dependencySet>
     </dependencySets>
+    <files>
+        <!-- Copy libjinput-osx.jnilib from natives and rename to libjinput-osx.dylib -->
+        <file>
+            <source>${project.build.directory}/natives/libjinput-osx.jnilib</source>
+            <outputDirectory>matlab/lib/</outputDirectory>
+            <destName>libjinput-osx.dylib</destName>
+        </file>
+    </files>
 </assembly>