diff --git a/.idea/libraries/jna.xml b/.idea/libraries/jna.xml
index d9fed3852d8f..f59f3ab48c59 100644
--- a/.idea/libraries/jna.xml
+++ b/.idea/libraries/jna.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
   <library name="jna">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/jna-utils.jar!/" />
       <root url="jar://$PROJECT_DIR$/lib/jna.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/jna-platform.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/jna-src.zip!/src" />
-      <root url="jar://$PROJECT_DIR$/lib/src/jna-src.zip!/contrib/platform/src" />
+      <root url="jar://$PROJECT_DIR$/lib/src/jna.zip!/" />
+      <root url="jar://$PROJECT_DIR$/lib/src/jna-platform.zip!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant
index c7f2e817330c..d1e648b7ea79 100644
--- a/build/scripts/libLicenses.gant
+++ b/build/scripts/libLicenses.gant
@@ -199,7 +199,7 @@ libraryLicense(name: "javawriter", libraryName: "javawriter", license: "Apache 2
 libraryLicense(name: "JGoodies Forms", libraryName: "jgoodies-forms", version: "1.1-preview 2006-05-04 11:55:37", license: "BSD ", url: "http://www.jgoodies.com/freeware/forms/", licenseUrl: "http://www.jgoodies.com/downloads/libraries.html")
 libraryLicense(name: "JGoodies Looks", libraryName: "jgoodies-looks", version: "2.4.2", license: "BSD ", url: "http://www.jgoodies.com/freeware/looks/", licenseUrl: "http://www.jgoodies.com/downloads/libraries.html")
 libraryLicense(name: "JGoodies Common", libraryName: "jgoodies-common", version: "1.2.1", license: "BSD ", url: "http://www.jgoodies.com/freeware/looks/", licenseUrl: "http://www.jgoodies.com/downloads/libraries.html")
-libraryLicense(name: "JNA", libraryName: "jna", version: "3.4.0", license: "LGPL 2.1", url: "https://jna.dev.java.net/", licenseUrl: "http://www.opensource.org/licenses/lgpl-2.1.php")
+libraryLicense(name: "JNA", libraryName: "jna", version: "4.1.0", license: "LGPL 2.1", url: "https://jna.dev.java.net/", licenseUrl: "http://www.opensource.org/licenses/lgpl-2.1.php")
 libraryLicense(name: "JSch", libraryName: "JSch", version: "0.1.52", license: "BSD", url: "http://www.jcraft.com/jsch/", licenseUrl: "http://www.jcraft.com/jsch/LICENSE.txt")
 libraryLicense(name: "jsch-agent-proxy", libraryName: "jsch-agent-proxy", version: "0.0.6", license: "BSD", url: "https://github.com/ymnk/jsch-agent-proxy", licenseUrl: "https://github.com/ymnk/jsch-agent-proxy/blob/master/LICENSE.txt")
 libraryLicense(name: "jsch-agent-proxy for svnkit trilead", libraryName: "jsch.agentproxy.svnkit-trilead-ssh2.jar", version: "0.0.6", license: "BSD", url: "https://github.com/ymnk/jsch-agent-proxy", licenseUrl: "https://github.com/ymnk/jsch-agent-proxy/blob/master/LICENSE.txt")
diff --git a/lib/jna-platform.jar b/lib/jna-platform.jar
new file mode 100644
index 000000000000..8d5fe3deeae9
Binary files /dev/null and b/lib/jna-platform.jar differ
diff --git a/lib/jna-utils.jar b/lib/jna-utils.jar
deleted file mode 100644
index 2d9a0f2fd448..000000000000
Binary files a/lib/jna-utils.jar and /dev/null differ
diff --git a/lib/jna.jar b/lib/jna.jar
index 8321956fd1da..b1a3922fec1a 100644
Binary files a/lib/jna.jar and b/lib/jna.jar differ
diff --git a/lib/src/jna-platform.zip b/lib/src/jna-platform.zip
new file mode 100644
index 000000000000..21ebc8e1acca
Binary files /dev/null and b/lib/src/jna-platform.zip differ
diff --git a/lib/src/jna-src.zip b/lib/src/jna-src.zip
deleted file mode 100644
index 5b55bbdaf16e..000000000000
Binary files a/lib/src/jna-src.zip and /dev/null differ
diff --git a/lib/src/jna.zip b/lib/src/jna.zip
new file mode 100644
index 000000000000..df0617bf9cf1
Binary files /dev/null and b/lib/src/jna.zip differ