diff --git a/bundles/org.eclipse.build.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.build.tools/META-INF/MANIFEST.MF
index 1abc8af..f0c6fe0 100644
--- a/bundles/org.eclipse.build.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.build.tools/META-INF/MANIFEST.MF
@@ -10,3 +10,4 @@
  org.eclipse.osgi
 Bundle-ClassPath: buildTools.jar
 Bundle-Vendor: %Bundle-Vendor
+Automatic-Module-Name: org.eclipse.build.tools
diff --git a/bundles/org.eclipse.releng.build.tools.comparator/META-INF/MANIFEST.MF b/bundles/org.eclipse.releng.build.tools.comparator/META-INF/MANIFEST.MF
index 3896936..1577a96 100644
--- a/bundles/org.eclipse.releng.build.tools.comparator/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.releng.build.tools.comparator/META-INF/MANIFEST.MF
@@ -10,3 +10,4 @@
 Bundle-ClassPath: comparatorSummary.jar
 Export-Package: org.eclipse.releng.build.tools.comparator,
  org.eclipse.releng.build.tools.comparator.ant
+Automatic-Module-Name: org.eclipse.releng.build.tools.comparator
diff --git a/bundles/org.eclipse.releng.build.tools.convert.application/META-INF/MANIFEST.MF b/bundles/org.eclipse.releng.build.tools.convert.application/META-INF/MANIFEST.MF
index db09122..58cf612 100644
--- a/bundles/org.eclipse.releng.build.tools.convert.application/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.releng.build.tools.convert.application/META-INF/MANIFEST.MF
@@ -9,3 +9,4 @@
  org.eclipse.releng.build.tools.convert;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.releng.build.tools.convert.application
diff --git a/bundles/org.eclipse.releng.build.tools.convert/META-INF/MANIFEST.MF b/bundles/org.eclipse.releng.build.tools.convert/META-INF/MANIFEST.MF
index 234b733..cb99cd0 100644
--- a/bundles/org.eclipse.releng.build.tools.convert/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.releng.build.tools.convert/META-INF/MANIFEST.MF
@@ -11,3 +11,4 @@
  org.eclipse.equinox.app
 Export-Package: org.eclipse.releng.build.tools.convert.ant,
  org.eclipse.releng.build.tools.convert.dom
+Automatic-Module-Name: org.eclipse.releng.build.tools.convert
diff --git a/bundles/org.eclipse.test.performance.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.test.performance.ui/META-INF/MANIFEST.MF
index 5d4edc7..1f7908d 100644
--- a/bundles/org.eclipse.test.performance.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.test.performance.ui/META-INF/MANIFEST.MF
@@ -23,3 +23,4 @@
  org.eclipse.test.internal.performance.results.utils;x-internal:=true,
  org.eclipse.test.performance.ui
 Import-Package: org.apache.derby.jdbc;resolution:=optional
+Automatic-Module-Name: org.eclipse.test.performance.ui