diff --git a/upb/BUILD b/upb/BUILD
index 53c5b61e6d..02d65bdee2 100644
--- a/upb/BUILD
+++ b/upb/BUILD
@@ -81,6 +81,11 @@ package_group(
     packages = ["//..."],
 )
 
+package_group(
+    name = "friend_generators",
+    packages = ["//..."],
+)
+
 cc_library(
     name = "upb",
     hdrs = [
diff --git a/upb_generator/BUILD b/upb_generator/BUILD
index 04085079ee..c9602733e6 100644
--- a/upb_generator/BUILD
+++ b/upb_generator/BUILD
@@ -123,7 +123,7 @@ bootstrap_cc_library(
         "//upb:descriptor_upb_proto",
     ],
     copts = UPB_DEFAULT_CPPOPTS,
-    visibility = ["//protos_generator:__pkg__"],
+    visibility = ["//visibility:public"],
     deps = [
         "//upb:base",
         "//upb:mini_descriptor",