diff --git a/org.eclipse.m2e.binaryproject.tests/META-INF/MANIFEST.MF b/org.eclipse.m2e.binaryproject.tests/META-INF/MANIFEST.MF
index 5bb04b7..6f4696f 100644
--- a/org.eclipse.m2e.binaryproject.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.binaryproject.tests/META-INF/MANIFEST.MF
@@ -16,3 +16,4 @@
  org.eclipse.core.runtime;bundle-version="3.8.0"
 Import-Package: org.slf4j;version="1.6.2"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.m2e.binaryproject.tests
diff --git a/org.eclipse.m2e.binaryproject.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.binaryproject.ui/META-INF/MANIFEST.MF
index 75b8563..68e9172 100644
--- a/org.eclipse.m2e.binaryproject.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.binaryproject.ui/META-INF/MANIFEST.MF
@@ -14,3 +14,4 @@
  org.eclipse.m2e.maven.runtime;bundle-version="[1.15.0,1.16.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.m2e.binaryproject.ui
diff --git a/org.eclipse.m2e.binaryproject/META-INF/MANIFEST.MF b/org.eclipse.m2e.binaryproject/META-INF/MANIFEST.MF
index 2a32d90..96103f5 100644
--- a/org.eclipse.m2e.binaryproject/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.binaryproject/META-INF/MANIFEST.MF
@@ -21,3 +21,4 @@
 Export-Package: org.eclipse.m2e.binaryproject.internal;x-friends:="org.eclipse.m2e.sourcelookup,org.eclipse.m2e.sourcelookup.ui"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.m2e.binaryproject.internal.BinaryProjectPlugin
+Automatic-Module-Name: org.eclipse.m2e.binaryproject
diff --git a/org.eclipse.m2e.core.tests/META-INF/MANIFEST.MF b/org.eclipse.m2e.core.tests/META-INF/MANIFEST.MF
index 16e88f6..50b1465 100644
--- a/org.eclipse.m2e.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.core.tests/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@
  org.eclipse.m2e.maven.runtime;bundle-version="1.10.0"
 Import-Package: javax.annotation;version="1.2.0"
 Eclipse-BundleShape: dir
+Automatic-Module-Name: org.eclipse.m2e.core.tests
diff --git a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
index 7b41fed..179c8e8 100644
--- a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
@@ -40,3 +40,4 @@
 Import-Package: org.eclipse.compare.rangedifferencer,
  org.eclipse.ltk.core.refactoring,
  org.slf4j;version="1.6.2"
+Automatic-Module-Name: org.eclipse.m2e.core.ui
diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
index d98e093..e9a0428 100644
--- a/org.eclipse.m2e.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
@@ -50,3 +50,4 @@
 MavenArtifact-GroupId: org.eclipse.m2e
 MavenArtifact-ArtifactId: org.eclipse.m2e.core
 Import-Package: org.slf4j;version="1.6.2"
+Automatic-Module-Name: org.eclipse.m2e.core
diff --git a/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF b/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF
index df4b18c..0ccaef2 100644
--- a/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF
@@ -44,3 +44,4 @@
 Bundle-Activator: org.eclipse.m2e.internal.discovery.DiscoveryActivator
 Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/component.xml
+Automatic-Module-Name: org.eclipse.m2e.discovery
diff --git a/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF
index 0d229d5..2f155c1 100644
--- a/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.editor.xml/META-INF/MANIFEST.MF
@@ -35,3 +35,4 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/component.xml
 Import-Package: org.slf4j;version="1.6.2"
+Automatic-Module-Name: org.eclipse.m2e.editor.xml
diff --git a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF
index ce317ec..702e455 100644
--- a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF
@@ -33,3 +33,4 @@
  org.eclipse.m2e.editor.dialogs;x-internal:=true,
  org.eclipse.m2e.editor.pom;x-internal:=true
 Import-Package: org.slf4j;version="1.6.2"
+Automatic-Module-Name: org.eclipse.m2e.editor
diff --git a/org.eclipse.m2e.importer.tests/META-INF/MANIFEST.MF b/org.eclipse.m2e.importer.tests/META-INF/MANIFEST.MF
index a65a2f8..65f857b 100644
--- a/org.eclipse.m2e.importer.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.importer.tests/META-INF/MANIFEST.MF
@@ -17,3 +17,4 @@
  org.apache.ant,
  org.eclipse.jdt.core,
  org.apache.commons.io;bundle-version="2.2.0"
+Automatic-Module-Name: org.eclipse.m2e.importer.tests
diff --git a/org.eclipse.m2e.importer/META-INF/MANIFEST.MF b/org.eclipse.m2e.importer/META-INF/MANIFEST.MF
index 8af3954..c20f0d3 100644
--- a/org.eclipse.m2e.importer/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.importer/META-INF/MANIFEST.MF
@@ -16,3 +16,4 @@
 Bundle-Activator: org.eclipse.m2e.importer.internal.Activator
 Export-Package: org.eclipse.m2e.importer.internal
 Import-Package: org.slf4j;version="1.6.2"
+Automatic-Module-Name: org.eclipse.m2e.importer
diff --git a/org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF
index ffc6c99..a5db413 100644
--- a/org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF
@@ -22,3 +22,4 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Import-Package: org.slf4j;version="1.6.2"
+Automatic-Module-Name: org.eclipse.m2e.jdt.ui
diff --git a/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF b/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF
index 49581e5..4f59fc5 100644
--- a/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF
@@ -19,3 +19,4 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Import-Package: org.slf4j;version="1.6.2"
+Automatic-Module-Name: org.eclipse.m2e.jdt
diff --git a/org.eclipse.m2e.launching/META-INF/MANIFEST.MF b/org.eclipse.m2e.launching/META-INF/MANIFEST.MF
index 0038b24..271f914 100644
--- a/org.eclipse.m2e.launching/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.launching/META-INF/MANIFEST.MF
@@ -33,3 +33,4 @@
  org.eclipse.m2e.ui.internal.launch;x-internal:=true
 Bundle-Activator: org.eclipse.m2e.internal.launch.MavenLaunchPlugin
 Import-Package: org.slf4j;version="1.6.2"
+Automatic-Module-Name: org.eclipse.m2e.launching
diff --git a/org.eclipse.m2e.lifecyclemapping.defaults/META-INF/MANIFEST.MF b/org.eclipse.m2e.lifecyclemapping.defaults/META-INF/MANIFEST.MF
index f484f7d..c713920 100644
--- a/org.eclipse.m2e.lifecyclemapping.defaults/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.lifecyclemapping.defaults/META-INF/MANIFEST.MF
@@ -8,3 +8,4 @@
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.m2e.lifecyclemapping.defaults
diff --git a/org.eclipse.m2e.model.edit/META-INF/MANIFEST.MF b/org.eclipse.m2e.model.edit/META-INF/MANIFEST.MF
index ae91431..27b1d72 100644
--- a/org.eclipse.m2e.model.edit/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.model.edit/META-INF/MANIFEST.MF
@@ -21,3 +21,4 @@
  org.eclipse.m2e.model.edit.pom.provider;x-internal:=true,
  org.eclipse.m2e.model.edit.pom.util;x-internal:=true
 Bundle-ClassPath: .
+Automatic-Module-Name: org.eclipse.m2e.model.edit
diff --git a/org.eclipse.m2e.profiles.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.profiles.core/META-INF/MANIFEST.MF
index 6c49ec6..79e582a 100644
--- a/org.eclipse.m2e.profiles.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.profiles.core/META-INF/MANIFEST.MF
@@ -14,3 +14,4 @@
 Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.eclipse.m2e.profiles.core.internal;x-friends:="org.eclipse.m2e.profiles.ui",
  org.eclipse.m2e.profiles.core.internal.management;x-internal:=true
+Automatic-Module-Name: org.eclipse.m2e.profiles.core
diff --git a/org.eclipse.m2e.profiles.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.profiles.ui/META-INF/MANIFEST.MF
index f4162b8..c54a35a 100644
--- a/org.eclipse.m2e.profiles.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.profiles.ui/META-INF/MANIFEST.MF
@@ -20,3 +20,4 @@
  org.eclipse.m2e.profiles.ui.internal.actions;x-internal:=true,
  org.eclipse.m2e.profiles.ui.internal.dialog;x-internal:=true
 Import-Package: org.slf4j;version="1.6.2"
+Automatic-Module-Name: org.eclipse.m2e.profiles.ui
diff --git a/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF b/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF
index 2ae1b97..ba4a6ea 100644
--- a/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF
@@ -25,3 +25,4 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.m2e.refactoring.exclude;x-internal:=true
 Import-Package: org.slf4j;version="1.6.2"
+Automatic-Module-Name: org.eclipse.m2e.refactoring
diff --git a/org.eclipse.m2e.scm/META-INF/MANIFEST.MF b/org.eclipse.m2e.scm/META-INF/MANIFEST.MF
index 7b20625..a4b0c9b 100644
--- a/org.eclipse.m2e.scm/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.scm/META-INF/MANIFEST.MF
@@ -26,3 +26,4 @@
  org.eclipse.ui.ide;bundle-version="3.5.1",
  org.eclipse.jdt.core;bundle-version="3.5.2";resolution:=optional
 Import-Package: org.slf4j;version="1.6.2"
+Automatic-Module-Name: org.eclipse.m2e.scm
diff --git a/org.eclipse.m2e.sourcelookup.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.sourcelookup.ui/META-INF/MANIFEST.MF
index a4d4d2d..f533d70 100644
--- a/org.eclipse.m2e.sourcelookup.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.sourcelookup.ui/META-INF/MANIFEST.MF
@@ -24,3 +24,4 @@
  org.eclipse.debug.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.m2e.sourcelookup.ui
diff --git a/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF b/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF
index e720a0c..e964a7f 100644
--- a/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF
@@ -24,3 +24,4 @@
 Bundle-ActivationPolicy: lazy
 Eclipse-BundleShape: dir
 Export-Package: org.eclipse.m2e.sourcelookup.internal.launch;x-friends:="org.eclipse.m2e.sourcelookup.ui,org.eclipse.m2e.binaryproject"
+Automatic-Module-Name: org.eclipse.m2e.sourcelookup
diff --git a/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF b/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF
index 6865a94..507e9b9 100644
--- a/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF
@@ -26,3 +26,4 @@
 Export-Package: org.eclipse.m2e.tests.common;x-internal:=true
 Import-Package: javax.servlet;version="3.1.0",
  javax.servlet.http;version="3.1.0"
+Automatic-Module-Name: org.eclipse.m2e.tests.common