diff --git a/core/pom.xml b/core/pom.xml
index dbd6def..6c5c229 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -13,6 +13,25 @@
 	<packaging>bundle</packaging>
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.8.1</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+				<executions>
+					<execution>
+						<id>default-compile</id>
+						<configuration>
+							<excludes>
+								<exclude>module-info.java</exclude>
+							</excludes>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
@@ -28,6 +47,27 @@
 					</instructions>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.moditect</groupId>
+				<artifactId>moditect-maven-plugin</artifactId>
+				<version>1.0.0.Final</version>
+				<executions>
+					<execution>
+						<id>add-module-info</id>
+						<phase>package</phase>
+						<goals>
+							<goal>add-module-info</goal>
+						</goals>
+						<configuration>
+							<jvmVersion>9</jvmVersion>
+							<module>
+								<moduleInfoFile>${project.build.sourceDirectory}/module-info.java</moduleInfoFile>
+							</module>
+							<overwriteExistingFiles>true</overwriteExistingFiles>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 
diff --git a/core/src/main/java/module-info.java b/core/src/main/java/module-info.java
new file mode 100644
index 0000000..f5aa8dc
--- /dev/null
+++ b/core/src/main/java/module-info.java
@@ -0,0 +1,8 @@
+module org.ocpsoft.prettytime {
+    exports org.ocpsoft.prettytime;
+    exports org.ocpsoft.prettytime.format;
+    exports org.ocpsoft.prettytime.i18n;
+    exports org.ocpsoft.prettytime.impl;
+    exports org.ocpsoft.prettytime.units;
+    provides org.ocpsoft.prettytime.PrettyTime with org.ocpsoft.prettytime.PrettyTime;
+}
\ No newline at end of file