diff --git a/autocatalog.cfg b/autocatalog.cfg
index d7b32d4..36587a2 100644
--- a/autocatalog.cfg
+++ b/autocatalog.cfg
@@ -3142,15 +3142,30 @@ package {
     multilib: "x86_64"
   }
 }
+package {
+  name: "cups-browsed"
+  type: PACKAGE_TYPE_NORMAL_FORK
+  repository {
+    name: "AppStream"
+    include_filter: "cups-browsed.aarch64"
+    include_filter: "cups-browsed.ppc64le"
+    include_filter: "cups-browsed.s390x"
+    include_filter: "cups-browsed.x86_64"
+  }
+}
 package {
   name: "cups-filters"
   type: PACKAGE_TYPE_NORMAL_FORK
   repository {
     name: "AppStream"
     include_filter: "cups-filters.aarch64"
+    include_filter: "cups-filters-driverless.aarch64"
     include_filter: "cups-filters.ppc64le"
+    include_filter: "cups-filters-driverless.ppc64le"
     include_filter: "cups-filters.s390x"
+    include_filter: "cups-filters-driverless.s390x"
     include_filter: "cups-filters.x86_64"
+    include_filter: "cups-filters-driverless.x86_64"
   }
 }
 package {
@@ -9829,6 +9844,17 @@ package {
     include_filter: "ipmitool.x86_64"
   }
 }
+package {
+  name: "golang-github-openprinting-ipp-usb"
+  type: PACKAGE_TYPE_NORMAL_FORK
+  repository {
+    name: "AppStream"
+    include_filter: "ipp-usb.aarch64"
+    include_filter: "ipp-usb.ppc64le"
+    include_filter: "ipp-usb.s390x"
+    include_filter: "ipp-usb.x86_64"
+  }
+}
 package {
   name: "ipset"
   type: PACKAGE_TYPE_NORMAL_FORK
diff --git a/hidden.cfg b/hidden.cfg
index fb68313..0cabe4f 100644
--- a/hidden.cfg
+++ b/hidden.cfg
@@ -2378,17 +2378,6 @@ package {
     include_filter: "cli11-devel.noarch"
   }
 }
-package {
-  name: "cups-browsed"
-  type: PACKAGE_TYPE_NORMAL_FORK
-  repository {
-    name: "hidden"
-    include_filter: "cups-browsed.aarch64"
-    include_filter: "cups-browsed.ppc64le"
-    include_filter: "cups-browsed.s390x"
-    include_filter: "cups-browsed.x86_64"
-  }
-}
 package {
   name: "doctest"
   type: PACKAGE_TYPE_NORMAL_FORK
@@ -2717,18 +2706,6 @@ package {
     include_filter: "golang-github-openprinting-goipp-devel.noarch"
   }
 }
-package {
-  name: "golang-github-openprinting-ipp-usb"
-  type: PACKAGE_TYPE_NORMAL_FORK
-  repository {
-    name: "hidden"
-    include_filter: "ipp-usb.aarch64"
-    include_filter: "golang-github-openprinting-ipp-usb-devel.noarch"
-    include_filter: "ipp-usb.ppc64le"
-    include_filter: "ipp-usb.s390x"
-    include_filter: "ipp-usb.x86_64"
-  }
-}
 package {
   name: "google-benchmark"
   type: PACKAGE_TYPE_NORMAL_FORK