diff --git a/aggregator.pom b/aggregator.pom
index 980cf7d..52fb594 100644
--- a/aggregator.pom
+++ b/aggregator.pom
@@ -55,6 +55,7 @@
             <configuration>
               <instructions>
 		<Bundle-SymbolicName>${osgi.bsn}</Bundle-SymbolicName>
+		<Automatic-Module-Name>${osgi.bsn}</Automatic-Module-Name>
 		<_nouses>true</_nouses>
               </instructions>
             </configuration>
diff --git a/junit5.spec b/junit5.spec
index 2c4cf27..82d4a3f 100644
--- a/junit5.spec
+++ b/junit5.spec
@@ -10,10 +10,10 @@
 
 Name:           junit5
 Version:        5.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Java regression testing framework
-# junit-platform-surefire-provider is under ASL 2.0, all other modules use EPL (see LICENSE.md)
-License:        EPL and ASL 2.0
+# junit-platform-surefire-provider is under ASL 2.0, all other modules use EPL-2.0 (see LICENSE.md)
+License:        EPL-2.0 and ASL 2.0
 URL:            http://junit.org/junit5/
 BuildArch:      noarch
 
@@ -177,6 +177,10 @@ ln -s ../../javadoc/junit5 documentation/src/docs/api
 %doc documentation/src/docs/*
 
 %changelog
+* Wed Jun 27 2018 Mat Booth <mat.booth@redhat.com> - 5.0.0-4
+- Add java 9 automatic module name headers to jar files
+- License correction EPL -> EPL-2.0
+
 * Thu Mar 15 2018 Michael Simacek <msimacek@redhat.com> - 5.0.0-3
 - Disable gradle plugin to fix FTBFS