diff --git a/doc/src/sgml/information_schema.sgml b/doc/src/sgml/information_schema.sgml
index 3ac555dad3..22e17bb5e6 100644
--- a/doc/src/sgml/information_schema.sgml
+++ b/doc/src/sgml/information_schema.sgml
@@ -4547,8 +4547,9 @@ ORDER BY c.ordinal_position;
   <title><literal>schemata</literal></title>
 
   <para>
-   The view <literal>schemata</literal> contains all schemas in the
-   current database that are owned by a currently enabled role.
+   The view <literal>schemata</literal> contains all schemas in the current
+   database that the current user has access to (by way of being the owner or
+   having some privilege).
   </para>
 
   <table>
diff --git a/src/backend/catalog/information_schema.sql b/src/backend/catalog/information_schema.sql
index 95f267f224..c5f7a8b210 100644
--- a/src/backend/catalog/information_schema.sql
+++ b/src/backend/catalog/information_schema.sql
@@ -1502,7 +1502,9 @@ CREATE VIEW schemata AS
            CAST(null AS sql_identifier) AS default_character_set_name,
            CAST(null AS character_data) AS sql_path
     FROM pg_namespace n, pg_authid u
-    WHERE n.nspowner = u.oid AND pg_has_role(n.nspowner, 'USAGE');
+    WHERE n.nspowner = u.oid
+          AND (pg_has_role(n.nspowner, 'USAGE')
+               OR has_schema_privilege(n.oid, 'CREATE, USAGE'));
 
 GRANT SELECT ON schemata TO PUBLIC;