diff --git a/org.eclipse.help.base/META-INF/MANIFEST.MF b/org.eclipse.help.base/META-INF/MANIFEST.MF
index 9b18061..157a78b 100644
--- a/org.eclipse.help.base/META-INF/MANIFEST.MF
+++ b/org.eclipse.help.base/META-INF/MANIFEST.MF
@@ -51,3 +51,4 @@
  org.eclipse.equinox.http.jetty;resolution:=optional
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.help.base
diff --git a/org.eclipse.help.ui/META-INF/MANIFEST.MF b/org.eclipse.help.ui/META-INF/MANIFEST.MF
index 51bf0f1..6118df6 100644
--- a/org.eclipse.help.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.help.ui/META-INF/MANIFEST.MF
@@ -26,3 +26,4 @@
 Import-Package: com.ibm.icu.text
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.help.ui
diff --git a/org.eclipse.help.webapp/META-INF/MANIFEST.MF b/org.eclipse.help.webapp/META-INF/MANIFEST.MF
index 15a8fb4..7667b75 100644
--- a/org.eclipse.help.webapp/META-INF/MANIFEST.MF
+++ b/org.eclipse.help.webapp/META-INF/MANIFEST.MF
@@ -24,3 +24,4 @@
  javax.servlet.http;version="3.1.0",
  org.osgi.service.http;version="1.2.0"
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.help.webapp
diff --git a/org.eclipse.help/META-INF/MANIFEST.MF b/org.eclipse.help/META-INF/MANIFEST.MF
index 74bf4a6..f5e8381 100644
--- a/org.eclipse.help/META-INF/MANIFEST.MF
+++ b/org.eclipse.help/META-INF/MANIFEST.MF
@@ -69,3 +69,4 @@
  org.xml.sax.helpers
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.help
diff --git a/org.eclipse.ua.tests.doc/META-INF/MANIFEST.MF b/org.eclipse.ua.tests.doc/META-INF/MANIFEST.MF
index 26ce7d9..fe25f58 100644
--- a/org.eclipse.ua.tests.doc/META-INF/MANIFEST.MF
+++ b/org.eclipse.ua.tests.doc/META-INF/MANIFEST.MF
@@ -22,3 +22,4 @@
  org.eclipse.ua.tests.doc.internal.dialogs;x-internal:=true,
  org.eclipse.ua.tests.doc.internal.linkchecker;x-internal:=true
 Eclipse-BundleShape: dir
+Automatic-Module-Name: org.eclipse.ua.tests.doc
diff --git a/org.eclipse.ua.tests/META-INF/MANIFEST.MF b/org.eclipse.ua.tests/META-INF/MANIFEST.MF
index 484b495..e8b1dc5 100644
--- a/org.eclipse.ua.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.ua.tests/META-INF/MANIFEST.MF
@@ -66,3 +66,4 @@
  org.eclipse.ua.tests.util,
  org.eclipse.ua.tests.browser
 Eclipse-BundleShape: dir
+Automatic-Module-Name: org.eclipse.ua.tests
diff --git a/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF b/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF
index 0ba208d..2fa93fd 100644
--- a/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF
+++ b/org.eclipse.ui.cheatsheets/META-INF/MANIFEST.MF
@@ -34,3 +34,4 @@
  org.xml.sax
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.ui.cheatsheets
diff --git a/org.eclipse.ui.intro.quicklinks/META-INF/MANIFEST.MF b/org.eclipse.ui.intro.quicklinks/META-INF/MANIFEST.MF
index 0b326e1..1a66814 100644
--- a/org.eclipse.ui.intro.quicklinks/META-INF/MANIFEST.MF
+++ b/org.eclipse.ui.intro.quicklinks/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.ui.intro.quicklinks;version="1.0.0"
+Automatic-Module-Name: org.eclipse.ui.intro.quicklinks
diff --git a/org.eclipse.ui.intro.universal/META-INF/MANIFEST.MF b/org.eclipse.ui.intro.universal/META-INF/MANIFEST.MF
index 8e5a41b..4f78dfc 100644
--- a/org.eclipse.ui.intro.universal/META-INF/MANIFEST.MF
+++ b/org.eclipse.ui.intro.universal/META-INF/MANIFEST.MF
@@ -22,3 +22,4 @@
  org.w3c.dom,
  org.xml.sax
 Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.ui.internal.intro.universal.contentdetect"
+Automatic-Module-Name: org.eclipse.ui.intro.universal
diff --git a/org.eclipse.ui.intro/META-INF/MANIFEST.MF b/org.eclipse.ui.intro/META-INF/MANIFEST.MF
index 4ac083c..b045e7a 100644
--- a/org.eclipse.ui.intro/META-INF/MANIFEST.MF
+++ b/org.eclipse.ui.intro/META-INF/MANIFEST.MF
@@ -39,3 +39,4 @@
  org.w3c.dom,
  org.xml.sax
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.ui.intro