diff --git a/autocatalog.cfg b/autocatalog.cfg
index 3ba34ff..8aba3cc 100644
--- a/autocatalog.cfg
+++ b/autocatalog.cfg
@@ -12189,7 +12189,7 @@ package {
 }
 package {
   name: "javapackages-tools"
-  type: PACKAGE_TYPE_NORMAL_FORK
+  type: PACKAGE_TYPE_NORMAL_FORK_MODULE
   repository {
     name: "AppStream"
     include_filter: "javapackages-filesystem.noarch"
diff --git a/hidden.cfg b/hidden.cfg
index b8524de..fb79657 100644
--- a/hidden.cfg
+++ b/hidden.cfg
@@ -2490,3 +2490,12 @@ package {
     include_filter: "extra-enforcer-rules-javadoc.noarch"
   }
 }
+package {
+  name: "javapackages-bootstrap"
+  type: PACKAGE_TYPE_NORMAL_FORK_MODULE
+  repository {
+    name: "hidden"
+    include_filter: "javapackages-bootstrap.noarch"
+    include_filter: "javapackages-bootstrap-openjdk8.noarch"
+  }
+}