diff --git a/CHANGES.md b/CHANGES.md
index 5126c46898..55094754f3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -9,6 +9,7 @@ Features
 --------
 * [#1217](https://github.com/java-native-access/jna/pull/1217): Add mappings for AIX `Perfstat` library to `c.s.j.p.unix.aix` - [@dbwiddis](https://github.com/dbwiddis).
 * [#1231](https://github.com/java-native-access/jna/pull/1231): The test suite can now be executed on Windows using either ANSI or UNICODE win32 API by passing `-Dw32.ascii=true/false` to ant. Previously, UNICODE was always used. - [@T-Svensson](https://github.com/T-Svensson/)
+* [#1237](https://github.com/java-native-access/jna/pull/1237): *Experimental:* Add artifacts that make jna and jna-platform named modules (provide `module-info.class`). The new artifacts are named `jna-jpms.jar` and `jna-platform-jpms.jar` - [@matthiasblaesing](https://github.com/matthiasblaesing).
 
 Bug Fixes
 ---------
diff --git a/ant-tools-src/com/sun/jna/CalcAndroidVersion.java b/ant-tools-src/com/sun/jna/ant/CalcAndroidVersion.java
similarity index 99%
rename from ant-tools-src/com/sun/jna/CalcAndroidVersion.java
rename to ant-tools-src/com/sun/jna/ant/CalcAndroidVersion.java
index 6afe9d404e..cdf1ccfdee 100644
--- a/ant-tools-src/com/sun/jna/CalcAndroidVersion.java
+++ b/ant-tools-src/com/sun/jna/ant/CalcAndroidVersion.java
@@ -22,7 +22,7 @@
  * containing JNA, in file "AL2.0".
  */
 
-package com.sun.jna;
+package com.sun.jna.ant;
 
 import java.io.IOException;
 import org.apache.tools.ant.Project;
diff --git a/ant-tools-src/com/sun/jna/ant/Exports.java b/ant-tools-src/com/sun/jna/ant/Exports.java
new file mode 100644
index 0000000000..107082d289
--- /dev/null
+++ b/ant-tools-src/com/sun/jna/ant/Exports.java
@@ -0,0 +1,77 @@
+/* Copyright (c) 2020 Matthias Bläsing, All Rights Reserved
+ *
+ * The contents of this file is dual-licensed under 2
+ * alternative Open Source/Free licenses: LGPL 2.1 or later and
+ * Apache License 2.0. (starting with JNA version 4.0.0).
+ *
+ * You can freely decide which license you want to apply to
+ * the project.
+ *
+ * You may obtain a copy of the LGPL License at:
+ *
+ * http://www.gnu.org/licenses/licenses.html
+ *
+ * A copy is also included in the downloadable source code package
+ * containing JNA, in file "LGPL2.1".
+ *
+ * You may obtain a copy of the Apache License at:
+ *
+ * http://www.apache.org/licenses/
+ *
+ * A copy is also included in the downloadable source code package
+ * containing JNA, in file "AL2.0".
+ */
+
+package com.sun.jna.ant;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class Exports {
+    private String packageName;
+    private String to;
+
+    public String getPackage() {
+        return packageName;
+    }
+
+    public void setPackage(String packageName) {
+        this.packageName = packageName;
+    }
+
+    public String getBinaryPackageName() {
+        return packageName.replace(".", "/");
+    }
+
+    public String getTo() {
+        return to;
+    }
+
+    public void setTo(String to) {
+        this.to = to;
+    }
+
+    public String[] getToList() {
+        if(to == null) {
+            return null;
+        } else {
+            Set<String> toList = new HashSet<String>();
+            for(String s: to.split(",")) {
+                String entry = s.trim();
+                if(! entry.isEmpty()) {
+                    toList.add(entry);
+                }
+            }
+            if(toList.isEmpty()) {
+                return null;
+            } else {
+                return toList.toArray(new String[0]);
+            }
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "Export{" + "package=" + packageName + ", to=" + to + '}';
+    }
+}
diff --git a/ant-tools-src/com/sun/jna/ant/ModuleGenerator.java b/ant-tools-src/com/sun/jna/ant/ModuleGenerator.java
new file mode 100644
index 0000000000..76215fec2f
--- /dev/null
+++ b/ant-tools-src/com/sun/jna/ant/ModuleGenerator.java
@@ -0,0 +1,193 @@
+/* Copyright (c) 2020 Matthias Bläsing, All Rights Reserved
+ *
+ * The contents of this file is dual-licensed under 2
+ * alternative Open Source/Free licenses: LGPL 2.1 or later and
+ * Apache License 2.0. (starting with JNA version 4.0.0).
+ *
+ * You can freely decide which license you want to apply to
+ * the project.
+ *
+ * You may obtain a copy of the LGPL License at:
+ *
+ * http://www.gnu.org/licenses/licenses.html
+ *
+ * A copy is also included in the downloadable source code package
+ * containing JNA, in file "LGPL2.1".
+ *
+ * You may obtain a copy of the Apache License at:
+ *
+ * http://www.apache.org/licenses/
+ *
+ * A copy is also included in the downloadable source code package
+ * containing JNA, in file "AL2.0".
+ */
+
+package com.sun.jna.ant;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.ModuleVisitor;
+import static org.objectweb.asm.Opcodes.*;
+
+public class ModuleGenerator {
+    private String name;
+    private String version;
+    private boolean open;
+    private String mainClass;
+    private File targetFile;
+    private List<Exports> exports = new ArrayList<Exports>();
+    private List<Opens> opens = new ArrayList<Opens>();
+    private List<Requires> requires = new ArrayList<Requires>();
+    private List<Package> packages = new ArrayList<Package>();
+
+    public File getTargetFile() {
+        return targetFile;
+    }
+
+    public void setTargetFile(File targetFile) {
+        this.targetFile = targetFile;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public boolean isOpen() {
+        return open;
+    }
+
+    public void setOpen(boolean open) {
+        this.open = open;
+    }
+
+    public String getMainClass() {
+        return mainClass;
+    }
+
+    public void setMainClass(String mainClass) {
+        this.mainClass = mainClass;
+    }
+
+    public String getMainClassBinary() {
+        if(mainClass != null) {
+            return mainClass.replace(".", "/");
+        } else {
+            return mainClass;
+        }
+    }
+
+    public Exports createExports() {
+        Exports export = new Exports();
+        this.exports.add(export);
+        return export;
+    }
+
+    public List<Exports> getExports() {
+        return exports;
+    }
+
+    public void setExports(List<Exports> exports) {
+        this.exports = exports;
+    }
+
+    public Requires createRequires() {
+        Requires require = new Requires();
+        this.requires.add(require);
+        return require;
+    }
+
+    public List<Requires> getRequires() {
+        return requires;
+    }
+
+    public void setRequires(List<Requires> requires) {
+        this.requires = requires;
+    }
+
+    public Opens createOpens() {
+        Opens openEntry = new Opens();
+        this.opens.add(openEntry);
+        return openEntry;
+    }
+
+    public List<Opens> getOpens() {
+        return opens;
+    }
+
+    public void setOpens(List<Opens> opens) {
+        this.opens = opens;
+    }
+
+    public Package createPackage() {
+        Package packageEntry = new Package();
+        this.packages.add(packageEntry);
+        return packageEntry;
+    }
+
+    public List<Package> getPackages() {
+        return packages;
+    }
+
+    public void setPackages(List<Package> packageEntry) {
+        this.packages = packageEntry;
+    }
+
+    public void execute() throws IOException {
+        System.out.println(this);
+        ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
+        cw.visit(V9, ACC_MODULE, "module-info", null, null, null);
+        ModuleVisitor mv = cw.visitModule(name, (open ? ACC_OPEN : 0), version);
+        mv.visitRequire("java.base", ACC_MANDATED, null);
+        for(Requires require: requires) {
+            mv.visitRequire(
+                require.getModule(),
+                (require.isStatic() ? ACC_STATIC : 0)|( require.isTransitive() ? ACC_TRANSITIVE : 0),
+                null);
+        }
+        for(Exports export: exports) {
+            mv.visitExport(
+                export.getBinaryPackageName(),
+                0,
+                export.getToList()
+            );
+        }
+        for(Opens openEntry: opens) {
+            mv.visitOpen(
+                openEntry.getBinaryPackageName(),
+                0,
+                openEntry.getToList());
+        }
+        for(Package packageEntry: packages) {
+            mv.visitPackage(packageEntry.getName());
+        }
+        if(getMainClassBinary() != null) {
+            mv.visitMainClass(getMainClassBinary());
+        }
+        mv.visitEnd();
+        cw.visitEnd();
+        try (FileOutputStream fos = new FileOutputStream(targetFile)) {
+            fos.write(cw.toByteArray());
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "ModuleGenerator{" + "name=" + name + ", version=" + version + ", open=" + open + ", mainClass=" + mainClass + ", targetFile=" + targetFile + ", exports=" + exports + ", opens=" + opens + ", requires=" + requires + ", packages=" + packages + '}';
+    }
+}
diff --git a/ant-tools-src/com/sun/jna/ant/Opens.java b/ant-tools-src/com/sun/jna/ant/Opens.java
new file mode 100644
index 0000000000..07a6c8241b
--- /dev/null
+++ b/ant-tools-src/com/sun/jna/ant/Opens.java
@@ -0,0 +1,77 @@
+/* Copyright (c) 2020 Matthias Bläsing, All Rights Reserved
+ *
+ * The contents of this file is dual-licensed under 2
+ * alternative Open Source/Free licenses: LGPL 2.1 or later and
+ * Apache License 2.0. (starting with JNA version 4.0.0).
+ *
+ * You can freely decide which license you want to apply to
+ * the project.
+ *
+ * You may obtain a copy of the LGPL License at:
+ *
+ * http://www.gnu.org/licenses/licenses.html
+ *
+ * A copy is also included in the downloadable source code package
+ * containing JNA, in file "LGPL2.1".
+ *
+ * You may obtain a copy of the Apache License at:
+ *
+ * http://www.apache.org/licenses/
+ *
+ * A copy is also included in the downloadable source code package
+ * containing JNA, in file "AL2.0".
+ */
+
+package com.sun.jna.ant;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class Opens {
+    private String packageName;
+    private String to;
+
+    public String getPackage() {
+        return packageName;
+    }
+
+    public void setPackage(String packageName) {
+        this.packageName = packageName;
+    }
+
+    public String getBinaryPackageName() {
+        return packageName.replace(".", "/");
+    }
+
+    public String getTo() {
+        return to;
+    }
+
+    public void setTo(String to) {
+        this.to = to;
+    }
+
+    public String[] getToList() {
+        if(to == null) {
+            return null;
+        } else {
+            Set<String> toList = new HashSet<String>();
+            for(String s: to.split(",")) {
+                String entry = s.trim();
+                if(! entry.isEmpty()) {
+                    toList.add(entry);
+                }
+            }
+            if(toList.isEmpty()) {
+                return null;
+            } else {
+                return toList.toArray(new String[0]);
+            }
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "Opens{" + "packageName=" + packageName + ", to=" + to + '}';
+    }
+}
diff --git a/ant-tools-src/com/sun/jna/ant/Package.java b/ant-tools-src/com/sun/jna/ant/Package.java
new file mode 100644
index 0000000000..4b6fbaf196
--- /dev/null
+++ b/ant-tools-src/com/sun/jna/ant/Package.java
@@ -0,0 +1,42 @@
+/* Copyright (c) 2020 Matthias Bläsing, All Rights Reserved
+ *
+ * The contents of this file is dual-licensed under 2
+ * alternative Open Source/Free licenses: LGPL 2.1 or later and
+ * Apache License 2.0. (starting with JNA version 4.0.0).
+ *
+ * You can freely decide which license you want to apply to
+ * the project.
+ *
+ * You may obtain a copy of the LGPL License at:
+ *
+ * http://www.gnu.org/licenses/licenses.html
+ *
+ * A copy is also included in the downloadable source code package
+ * containing JNA, in file "LGPL2.1".
+ *
+ * You may obtain a copy of the Apache License at:
+ *
+ * http://www.apache.org/licenses/
+ *
+ * A copy is also included in the downloadable source code package
+ * containing JNA, in file "AL2.0".
+ */
+
+package com.sun.jna.ant;
+
+public class Package {
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return "Package{" + "name=" + name + '}';
+    }
+}
diff --git a/ant-tools-src/com/sun/jna/ant/Requires.java b/ant-tools-src/com/sun/jna/ant/Requires.java
new file mode 100644
index 0000000000..45ec6d6e9e
--- /dev/null
+++ b/ant-tools-src/com/sun/jna/ant/Requires.java
@@ -0,0 +1,60 @@
+/* Copyright (c) 2020 Matthias Bläsing, All Rights Reserved
+ *
+ * The contents of this file is dual-licensed under 2
+ * alternative Open Source/Free licenses: LGPL 2.1 or later and
+ * Apache License 2.0. (starting with JNA version 4.0.0).
+ *
+ * You can freely decide which license you want to apply to
+ * the project.
+ *
+ * You may obtain a copy of the LGPL License at:
+ *
+ * http://www.gnu.org/licenses/licenses.html
+ *
+ * A copy is also included in the downloadable source code package
+ * containing JNA, in file "LGPL2.1".
+ *
+ * You may obtain a copy of the Apache License at:
+ *
+ * http://www.apache.org/licenses/
+ *
+ * A copy is also included in the downloadable source code package
+ * containing JNA, in file "AL2.0".
+ */
+
+package com.sun.jna.ant;
+
+public class Requires {
+    private String module;
+    private boolean transitive;
+    private boolean _static;
+
+    public String getModule() {
+        return module;
+    }
+
+    public void setModule(String module) {
+        this.module = module;
+    }
+
+    public boolean isTransitive() {
+        return transitive;
+    }
+
+    public void setTransitive(boolean transitive) {
+        this.transitive = transitive;
+    }
+
+    public boolean isStatic() {
+        return _static;
+    }
+
+    public void setStatic(boolean _static) {
+        this._static = _static;
+    }
+
+    @Override
+    public String toString() {
+        return "Requires{" + "module=" + module + ", transitive=" + transitive + '}';
+    }
+}
diff --git a/build-ant-tools.xml b/build-ant-tools.xml
new file mode 100644
index 0000000000..bb73fc7462
--- /dev/null
+++ b/build-ant-tools.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="JNA" default="default" basedir=".">
+    <description>Builds and tests JNA</description>
+    <property name="build" value="build" />
+    <target name="default">
+        <mkdir dir="${build}/ant-tools" />
+        <javac classpath="lib/ant.jar:lib/asm-8.0.1.jar"
+               destdir="${build}/ant-tools"
+               includeantruntime="false"
+               encoding="UTF-8"
+        >
+            <src path="src" />
+            <src path="ant-tools-src" />
+            <include name="**/ELFAnalyser.java" />
+            <include name="**/BuildArmSoftFloatDetector.java" />
+            <include name="**/ant/*.java" />
+            <include name="**/ModuleGenerator.java" />
+        </javac>
+    </target>
+</project>
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 43ad2b0e2e..32b1c5d870 100644
--- a/build.xml
+++ b/build.xml
@@ -2,7 +2,8 @@
 <project name="JNA" default="default" basedir="." 
          xmlns:artifact="antlib:org.apache.maven.artifact.ant"
          xmlns:as="antlib:org.codehaus.mojo.animal_sniffer"
-         xmlns:if="ant:if">
+         xmlns:if="ant:if"
+         xmlns:unless="ant:unless">
   <description>Builds and tests JNA</description>
 
   <!-- Default build compiles all platform-independent stuff as well
@@ -37,6 +38,7 @@
   <property name="aar" value="${name}.aar"/>
   <property name="minjar" value="${name}-min.jar"/>
   <property name="testjar" value="${name}-test.jar"/>
+  <property name="jar-jpms" value="${name}-jpms.jar"/>
   <property name="debug" value="true"/>
   <property name="debug.native" value="false"/>
   <property name="cflags_extra.native" value=""/>
@@ -123,6 +125,7 @@
   </condition>
   <property name="dist-jar" value="${dist}/${jar}"/>
   <property name="dist-aar" value="${dist}/${aar}"/>
+  <property name="dist-jar-jpms" value="${dist}/${jar-jpms}"/>
 
   <!-- Maven -->
   <!-- define Maven coordinates -->
@@ -135,6 +138,7 @@
   <property name="platform-jar" value="${dist}/jna-platform.jar"/>
   <property name="platform-javadoc-jar" value="${dist}/platform-${jna.version}-javadoc.jar" />
   <property name="platform-sources-jar" value="${dist}/platform-${jna.version}-sources.jar" />
+  <property name="platform-jpms-jar" value="${dist}/jna-platform-jpms.jar" />
 
   <!-- defined maven snapshots and staging repository id and url -->
   <property name="maven-snapshots-repository-id" value="oss.sonatype.org" />
@@ -171,20 +175,10 @@
            classpathref="maven-ant-tasks.classpath" />
 
   <target name="-prepare-anttools">
-      <mkdir dir="${build}/ant-tools" />
-      <javac classpath="lib/ant.jar"
-             destdir="${build}/ant-tools"
-             includeantruntime="false"
-             encoding="UTF-8"
-      >
-          <src path="src" />
-          <src path="ant-tools-src" />
-          <include name="**/ELFAnalyser.java" />
-          <include name="**/BuildArmSoftFloatDetector.java" />
-          <include name="**/CalcAndroidVersion.java" />
-      </javac>
-      <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${build}/ant-tools" />
-      <taskdef name="CalcAndroidVersion" classname="com.sun.jna.CalcAndroidVersion" classpath="${build}/ant-tools" />
+      <subant antfile="build-ant-tools.xml" buildpath="${basedir}"></subant>
+      <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${build}/ant-tools:$lib/asm-8.0.1.jar" />
+      <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${build}/ant-tools:lib/asm-8.0.1.jar" />
+      <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${build}/ant-tools:lib/asm-8.0.1.jar" />
   </target>
 
   <target name="-dynamic-properties" depends="-prepare-anttools">
@@ -431,36 +425,38 @@
     <!-- Bundle native components with primary jar to facilitate
          easy distribution to common platforms.
       -->
-    <jar jarfile="${build}/${jar}" duplicate="preserve" createUnicodeExtraFields="never" encoding="UTF-8">
-      <manifest>
-        <attribute name="Main-Class" value="com.sun.jna.Native"/>
-        <attribute name="Manifest-Version" value="1.0"/>
-        <attribute name="Implementation-Title" value="${impl.title}"/>
-        <attribute name="Implementation-Vendor" value="${vendor}"/>
-        <attribute name="Implementation-Version" value="${impl.version}"/>
-        <attribute name="Specification-Title" value="${spec.title}"/>
-        <attribute name="Specification-Vendor" value="${spec.vendor}"/>
-        <attribute name="Specification-Version" value="${spec.version}"/>
-        <attribute name="Automatic-Module-Name" value="com.sun.jna"/>
-        <!--
-            OSGi Bundle attributes
-            See http://www.osgi.org/Specifications/Reference
-          -->
-        <attribute name="Bundle-Category" value="jni"/>
-        <attribute name="Bundle-ManifestVersion" value="2"/>
-        <attribute name="Bundle-Name" value="jna"/>
-        <attribute name="Bundle-Description" value="JNA Library"/>
-        <attribute name="Bundle-SymbolicName" value="com.sun.jna"/>
-        <attribute name="Bundle-Version" value="${jna.major}.${jna.minor}.${jna.revision}"/>
-        <attribute name="Bundle-RequiredExecutionEnvironment" value="JavaSE-1.6"/>
-        <attribute name="Bundle-Vendor" value="${vendor}"/>
-        <attribute name="Bundle-ActivationPolicy" value="lazy"/>
-        <attribute name="Export-Package" value="com.sun.jna;version=${jna.major}.${jna.minor}.${jna.revision}, com.sun.jna.ptr;version=${jna.major}.${jna.minor}.${jna.revision}, com.sun.jna.win32;version=${jna.major}.${jna.minor}.${jna.revision}"/>
-        <!-- Note that no terminal "*" is included in this list,
-             which will force failure on unsupported platforms.
-          -->
-        <attribute name="Bundle-NativeCode"
-                   value="
+  <macrodef name="build-manifest">
+      <attribute name="target" />
+      <attribute name="module-info" default="false" />
+      <sequential>
+          <manifest file="@{target}" mode="replace">
+              <attribute name="Main-Class" value="com.sun.jna.Native"/>
+              <attribute name="Manifest-Version" value="1.0"/>
+              <attribute name="Implementation-Title" value="${impl.title}"/>
+              <attribute name="Implementation-Vendor" value="${vendor}"/>
+              <attribute name="Implementation-Version" value="${impl.version}"/>
+              <attribute name="Specification-Title" value="${spec.title}"/>
+              <attribute name="Specification-Vendor" value="${spec.vendor}"/>
+              <attribute name="Specification-Version" value="${spec.version}"/>
+              <!--
+                OSGi Bundle attributes
+                See http://www.osgi.org/Specifications/Reference
+              -->
+              <attribute name="Bundle-Category" value="jni"/>
+              <attribute name="Bundle-ManifestVersion" value="2"/>
+              <attribute name="Bundle-Name" value="jna"/>
+              <attribute name="Bundle-Description" value="JNA Library"/>
+              <attribute name="Bundle-SymbolicName" value="com.sun.jna"/>
+              <attribute name="Bundle-Version" value="${jna.major}.${jna.minor}.${jna.revision}"/>
+              <attribute name="Bundle-RequiredExecutionEnvironment" value="JavaSE-1.6"/>
+              <attribute name="Bundle-Vendor" value="${vendor}"/>
+              <attribute name="Bundle-ActivationPolicy" value="lazy"/>
+              <attribute name="Export-Package" value="com.sun.jna;version=${jna.major}.${jna.minor}.${jna.revision}, com.sun.jna.ptr;version=${jna.major}.${jna.minor}.${jna.revision}, com.sun.jna.win32;version=${jna.major}.${jna.minor}.${jna.revision}"/>
+              <!-- Note that no terminal "*" is included in this list,
+                 which will force failure on unsupported platforms.
+              -->
+              <attribute name="Bundle-NativeCode"
+                         value="
 com/sun/jna/win32-x86/jnidispatch.dll;
 processor=x86;osname=win32,
 com/sun/jna/win32-x86-64/jnidispatch.dll;
@@ -525,7 +521,34 @@ processor=x86-64;osname=openbsd,
 com/sun/jna/darwin/libjnidispatch.jnilib;
 osname=macosx;processor=x86;processor=x86-64;processor=ppc
 "/>
-      </manifest>
+          </manifest>
+          <manifest file="@{target}" mode="update" if:true="@{module-info}">
+              <attribute name="Multi-Release" value="true"/>
+          </manifest>
+          <manifest file="@{target}" mode="update" unless:true="@{module-info}">
+              <attribute name="Automatic-Module-Name" value="com.sun.jna"/>
+          </manifest>
+      </sequential>
+  </macrodef>
+    <delete dir="${build}/manifest"/>
+    <mkdir dir="${build}/manifest"/>
+    <build-manifest target="${build}/manifest/module.mf" module-info="true"/>
+    <build-manifest target="${build}/manifest/automatic.mf" module-info="false"/>
+    <ModuleGenerator
+        targetFile="${build}/manifest/module-info.class"
+        name="com.sun.jna"
+        version="${jna.major}.${jna.minor}.${jna.revision}"
+        open="false"
+    >
+        <exports package="com.sun.jna" />
+        <exports package="com.sun.jna.ptr" />
+        <exports package="com.sun.jna.win32" />
+        <exports package="com.sun.jna.internal" to="com.sun.jna.platform"/>
+        <requires module="java.logging" />
+        <requires module="java.desktop" />
+        <opens package="com.sun.jna.darwin" />
+    </ModuleGenerator>
+    <jar jarfile="${build}/${jar}" duplicate="preserve" createUnicodeExtraFields="never" encoding="UTF-8" manifest="${build}/manifest/automatic.mf">
       <fileset dir="${classes}" excludes="${jar.omitted}">
         <patternset refid="jar-compiled"/>
       </fileset>
@@ -614,6 +637,10 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
     <zip zipfile="${build}/${minjar}">
       <zipfileset src="${build}/${jar}" excludes="**/*jnidispatch*"/>
     </zip>
+    <jar jarfile="${build}/jna-jpms.jar" duplicate="preserve" createUnicodeExtraFields="never" encoding="UTF-8" manifest="${build}/manifest/module.mf">
+      <zipfileset src="${build}/${jar}" excludes="META-INF/MANIFEST.mf"/>
+      <zipfileset dir="${build}/manifest/" includes="module-info.class" prefix="META-INF/versions/9"/>
+    </jar>
   </target>
 
   <target name="aar" depends="jar" description="Build Android Archive">
@@ -1363,8 +1390,8 @@ cd ..
   <target name="dist" depends="jar,aar,javadoc,contrib-jars,compile-tests,native"
           description="Build distribution files">
     <copy todir="${dist}" force="true" overwrite="true">
-      <fileset dir="${build}" includes="${jar},${minjar},${aar}"/>
-      <fileset dir="${contrib}/platform/dist" includes="jna-platform.jar"/>
+      <fileset dir="${build}" includes="${jar},${minjar},${aar},${jar-jpms}"/>
+      <fileset dir="${contrib}/platform/dist" includes="jna-platform.jar,jna-platform-jpms.jar"/>
       <fileset dir="${lib.native}">
         <include name="*.jar"/>
         <exclude name="out-of-date.jar"/>
@@ -1435,6 +1462,14 @@ cd ..
       <arg value="-Dpackaging=aar"/>
     </artifact:mvn>
 
+    <artifact:mvn failonerror="true">
+      <arg value="org.apache.maven.plugins:maven-install-plugin:2.5:install-file"/>
+      <arg value="-DpomFile=${pom}"/>
+      <arg value="-Dfile=${dist-jar-jpms}"/>
+      <arg value="-Dclassifier=jpms"/>
+      <arg value="-Dpackaging=jar"/>
+    </artifact:mvn>
+
     <artifact:mvn failonerror="true">
       <arg value="org.apache.maven.plugins:maven-install-plugin:2.5:install-file"/>
       <arg value="-DpomFile=${pom-platform}"/>
@@ -1442,6 +1477,14 @@ cd ..
       <arg value="-Dsources=${platform-sources-jar}"/>
       <arg value="-Djavadoc=${platform-javadoc-jar}"/>
     </artifact:mvn>
+
+    <artifact:mvn failonerror="true">
+      <arg value="org.apache.maven.plugins:maven-install-plugin:2.5:install-file"/>
+      <arg value="-DpomFile=${pom-platform}"/>
+      <arg value="-Dfile=${platform-jpms-jar}"/>
+      <arg value="-Dclassifier=jpms"/>
+      <arg value="-Dpackaging=jar"/>
+    </artifact:mvn>
   </target>
 
   <!-- NOTE: The 'deploy' target works only if the version (jna.version in build.xml) ends in '-SNAPSHOT'. -->
@@ -1452,9 +1495,9 @@ cd ..
       <arg value="-DrepositoryId=${maven-snapshots-repository-id}"/>
       <arg value="-DpomFile=${pom}"/>
       <arg value="-Dfile=${dist-jar}"/>
-      <arg value="-Dfiles=${maven-sources-jar},${maven-javadoc-jar},${dist-aar}"/>
-      <arg value="-Dtypes=jar,jar,aar"/>
-      <arg value="-Dclassifiers=sources,javadoc,"/>
+      <arg value="-Dfiles=${maven-sources-jar},${maven-javadoc-jar},${dist-jar-jpms},${dist-aar}"/>
+      <arg value="-Dtypes=jar,jar,jar,aar"/>
+      <arg value="-Dclassifiers=sources,javadoc,jpms,"/>
     </artifact:mvn>
 
     <artifact:mvn failonerror="true">
@@ -1463,9 +1506,9 @@ cd ..
       <arg value="-DrepositoryId=${maven-snapshots-repository-id}"/>
       <arg value="-DpomFile=${pom-platform}"/>
       <arg value="-Dfile=${platform-jar}"/>
-      <arg value="-Dfiles=${platform-sources-jar},${platform-javadoc-jar}"/>
-      <arg value="-Dtypes=jar,jar"/>
-      <arg value="-Dclassifiers=sources,javadoc"/>
+      <arg value="-Dfiles=${platform-sources-jar},${platform-javadoc-jar},${platform-jpms-jar}"/>
+      <arg value="-Dtypes=jar,jar,jar"/>
+      <arg value="-Dclassifiers=sources,javadoc,jpms"/>
     </artifact:mvn>
   </target>
 
@@ -1480,9 +1523,9 @@ cd ..
       <arg value="-DrepositoryId=${maven-staging-repository-id}"/>
       <arg value="-DpomFile=${pom}"/>
       <arg value="-Dfile=${dist-jar}"/>
-      <arg value="-Dfiles=${maven-sources-jar},${maven-javadoc-jar},${dist-aar}"/>
-      <arg value="-Dclassifiers=sources,javadoc,"/>
-      <arg value="-Dtypes=jar,jar,aar"/>
+      <arg value="-Dfiles=${maven-sources-jar},${maven-javadoc-jar},${dist-jar-jpms},${dist-aar}"/>
+      <arg value="-Dclassifiers=sources,javadoc,jpms,"/>
+      <arg value="-Dtypes=jar,jar,jar,aar"/>
       <arg value="-Dgpg.useagent=true"/>
     </artifact:mvn>
 
@@ -1493,9 +1536,9 @@ cd ..
       <arg value="-DrepositoryId=${maven-staging-repository-id}"/>
       <arg value="-DpomFile=${pom-platform}"/>
       <arg value="-Dfile=${platform-jar}"/>
-      <arg value="-Dfiles=${platform-sources-jar},${platform-javadoc-jar}"/>
-      <arg value="-Dclassifiers=sources,javadoc"/>
-      <arg value="-Dtypes=jar,jar"/>
+      <arg value="-Dfiles=${platform-sources-jar},${platform-javadoc-jar},${platform-jpms-jar}"/>
+      <arg value="-Dclassifiers=sources,javadoc,jpms"/>
+      <arg value="-Dtypes=jar,jar,jar"/>
       <arg value="-Dgpg.useagent=true"/>
     </artifact:mvn>
   </target>
diff --git a/contrib/platform/build.xml b/contrib/platform/build.xml
index 7df4b112e6..51d54e1688 100644
--- a/contrib/platform/build.xml
+++ b/contrib/platform/build.xml
@@ -2,7 +2,9 @@
 <project name="platform"
          default="default"
          basedir="."
-         xmlns:as="antlib:org.codehaus.mojo.animal_sniffer">
+         xmlns:as="antlib:org.codehaus.mojo.animal_sniffer"
+         xmlns:if="ant:if"
+         xmlns:unless="ant:unless">
     <description>Builds and tests platform-specific code.</description>
     <import file="nbproject/build-impl.xml"/>
     <!--
@@ -111,32 +113,40 @@
         </macrodef>
     </target>
 
-    <target name="-pre-jar">
-        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
-        <manifest file="${tmp.manifest.file}" mode="replace">
-            <attribute name="Manifest-Version" value="1.0"/>
-            <attribute name="Implementation-Title" value="${impl.title}"/>
-            <attribute name="Implementation-Vendor" value="${vendor}"/>
-            <attribute name="Implementation-Version" value="${impl.version}"/>
-            <attribute name="Specification-Title" value="${spec.title}"/>
-            <attribute name="Specification-Vendor" value="${spec.vendor}"/>
-            <attribute name="Specification-Version" value="${spec.version}"/>
-            <attribute name="Automatic-Module-Name" value="com.sun.jna.platform"/>
-            <!--
-               OSGi Bundle attributes
-               See http://www.osgi.org/Specifications/Reference
-             -->
-            <attribute name="Bundle-Category" value="jni"/>
-            <attribute name="Bundle-ManifestVersion" value="2"/>
-            <attribute name="Bundle-Name" value="jna-platform"/>
-            <attribute name="Bundle-Description" value="JNA Platform Library"/>
-            <attribute name="Bundle-SymbolicName" value="com.sun.jna.platform"/>
-            <attribute name="Bundle-Version" value="${osgi.version}"/>
-            <attribute name="Bundle-RequiredExecutionEnvironment" value="J2SE-1.4"/>
-            <attribute name="Bundle-Vendor" value="${vendor}"/>
-            <attribute name="Require-Bundle" value="com.sun.jna;bundle-version=&quot;${osgi.version}&quot;"/>
-            <attribute name="Export-Package"
-                   value="
+    <target name="-prepare-anttools">
+        <subant antfile="build-ant-tools.xml" buildpath="${basedir}/../../"></subant>
+        <taskdef name="BuildArmSoftFloatDetector" classname="com.sun.jna.BuildArmSoftFloatDetector" classpath="${basedir}/../../build/ant-tools:${basedir}/../../lib/asm-8.0.1.jar" />
+        <taskdef name="CalcAndroidVersion" classname="com.sun.jna.ant.CalcAndroidVersion" classpath="${basedir}/../../build/ant-tools:${basedir}/../../lib/asm-8.0.1.jar" />
+        <taskdef name="ModuleGenerator" classname="com.sun.jna.ant.ModuleGenerator" classpath="${basedir}/../../build/ant-tools:${basedir}/../../lib/asm-8.0.1.jar" />
+    </target>
+
+    <macrodef name="build-manifest">
+        <attribute name="target" />
+        <attribute name="module-info" default="false" />
+        <sequential>
+            <manifest file="@{target}" mode="replace">
+                <attribute name="Manifest-Version" value="1.0"/>
+                <attribute name="Implementation-Title" value="${impl.title}"/>
+                <attribute name="Implementation-Vendor" value="${vendor}"/>
+                <attribute name="Implementation-Version" value="${impl.version}"/>
+                <attribute name="Specification-Title" value="${spec.title}"/>
+                <attribute name="Specification-Vendor" value="${spec.vendor}"/>
+                <attribute name="Specification-Version" value="${spec.version}"/>
+                <!--
+                  OSGi Bundle attributes
+                  See http://www.osgi.org/Specifications/Reference
+                -->
+                <attribute name="Bundle-Category" value="jni"/>
+                <attribute name="Bundle-ManifestVersion" value="2"/>
+                <attribute name="Bundle-Name" value="jna-platform"/>
+                <attribute name="Bundle-Description" value="JNA Platform Library"/>
+                <attribute name="Bundle-SymbolicName" value="com.sun.jna.platform"/>
+                <attribute name="Bundle-Version" value="${osgi.version}"/>
+                <attribute name="Bundle-RequiredExecutionEnvironment" value="J2SE-1.4"/>
+                <attribute name="Bundle-Vendor" value="${vendor}"/>
+                <attribute name="Require-Bundle" value="com.sun.jna;bundle-version=&quot;${osgi.version}&quot;"/>
+                <attribute name="Export-Package"
+                           value="
 com.sun.jna.platform;version=${osgi.version},
 com.sun.jna.platform.dnd;version=${osgi.version},
 com.sun.jna.platform.linux;version=${osgi.version},
@@ -152,7 +162,17 @@ com.sun.jna.platform.win32.COM.util;version=${osgi.version},
 com.sun.jna.platform.win32.COM.util.annotation;version=${osgi.version},
 com.sun.jna.platform.wince;version=${osgi.version}
 "/>
-        </manifest>
+            </manifest>
+            <manifest file="@{target}" mode="update" if:true="@{module-info}">
+                <attribute name="Multi-Release" value="true"/>
+            </manifest>
+            <manifest file="@{target}" mode="update" unless:true="@{module-info}">
+                <attribute name="Automatic-Module-Name" value="com.sun.jna.platform"/>
+            </manifest>
+        </sequential>
+    </macrodef>
+
+    <target name="-pre-jar" depends="-prepare-anttools">
         <delete dir="${build.classes.dir}/META-INF" />
         <mkdir dir="${build.classes.dir}/META-INF"/>
         <copy todir="${build.classes.dir}/META-INF">
@@ -160,6 +180,46 @@ com.sun.jna.platform.wince;version=${osgi.version}
         </copy>
     </target>
 
+    <target name="-post-jar" depends="-prepare-anttools">
+        <delete dir="${build.dir}/manifest"/>
+        <mkdir dir="${build.dir}/manifest"/>
+        <build-manifest target="${build.dir}/manifest/module.mf" module-info="true"/>
+        <build-manifest target="${build.dir}/manifest/automatic.mf" module-info="false"/>
+        <ModuleGenerator
+            targetFile="${build.dir}/manifest/module-info.class"
+            name="com.sun.jna.platform"
+            version="${osgi.version}"
+            open="false"
+        >
+            <exports package="com.sun.jna.platform" />
+            <exports package="com.sun.jna.platform.dnd" />
+            <exports package="com.sun.jna.platform.linux" />
+            <exports package="com.sun.jna.platform.mac" />
+            <exports package="com.sun.jna.platform.unix" />
+            <exports package="com.sun.jna.platform.unix.aix" />
+            <exports package="com.sun.jna.platform.unix.solaris" />
+            <exports package="com.sun.jna.platform.win32" />
+            <exports package="com.sun.jna.platform.win32.COM" />
+            <exports package="com.sun.jna.platform.win32.COM.tlb" />
+            <exports package="com.sun.jna.platform.win32.COM.tlb.imp" />
+            <exports package="com.sun.jna.platform.win32.COM.util" />
+            <exports package="com.sun.jna.platform.win32.COM.util.annotation" />
+            <exports package="com.sun.jna.platform.wince" />
+            <requires module="java.logging" />
+            <requires module="java.desktop" />
+            <requires module="java.datatransfer" />
+            <requires module="com.sun.jna" />
+        </ModuleGenerator>
+        <move file="dist/jna-platform.jar" tofile="${build.dir}/jna-platform-base.jar" />
+        <jar jarfile="dist/jna-platform.jar" duplicate="preserve" createUnicodeExtraFields="never" encoding="UTF-8" manifest="${build.dir}/manifest/automatic.mf">
+            <zipfileset src="${build.dir}/jna-platform-base.jar" excludes="META-INF/MANIFEST.mf"/>
+        </jar>
+        <jar jarfile="dist/jna-platform-jpms.jar" duplicate="preserve" createUnicodeExtraFields="never" encoding="UTF-8" manifest="${build.dir}/manifest/module.mf">
+            <zipfileset src="${build.dir}/jna-platform-base.jar" excludes="META-INF/MANIFEST.mf"/>
+            <zipfileset dir="${build.dir}/manifest/" includes="module-info.class" prefix="META-INF/versions/9"/>
+        </jar>
+    </target>
+
     <condition property="compatibility-check" value="true">
         <equals arg1="${javac.target}" arg2="1.6" />
     </condition>
@@ -183,8 +243,8 @@ com.sun.jna.platform.wince;version=${osgi.version}
     <target name="test" depends="init,compile,compile-test,-pre-test-run,-check-java6-compatibility,-warn-java6-compatiblity" description="Run platform unit tests.">
       <echo>Running platform tests: ${test.src.dir}</echo>
       <property name="test.fork" value="yes"/>
-      <property name="reports.junit" location="${build}/reports/junit/${os.prefix}"/>
-      <property name="results.junit" location="${build}/junit-results/${os.prefix}"/>
+      <property name="reports.junit" location="${build.dir}/reports/junit/${os.prefix}"/>
+      <property name="results.junit" location="${build.dir}/junit-results/${os.prefix}"/>
       <mkdir dir="${results.junit}"/>
       <echo>Saving test results in ${results.junit}</echo>
       <condition property="tests.platform.mac" value="**/mac/**/*Test.java">
diff --git a/lib/asm-8.0.1.jar b/lib/asm-8.0.1.jar
new file mode 100644
index 0000000000..744fecc025
Binary files /dev/null and b/lib/asm-8.0.1.jar differ
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 80ef8fc5b1..63e82e1e33 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -99,7 +99,7 @@ auxiliary.show.customizer.message=<message>
             </compilation-unit>
             <compilation-unit>
                 <package-root>ant-tools-src</package-root>
-                <classpath mode="compile">src:lib/ant.jar</classpath>
+                <classpath mode="compile">src:lib/ant.jar:lib/asm-8.0.1.jar</classpath>
                 <source-level>1.6</source-level>
             </compilation-unit>
         </java-data>