diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
index 720f1305a5c..d5d6bedb68e 100644
--- a/contrib/pg_upgrade/check.c
+++ b/contrib/pg_upgrade/check.c
@@ -593,7 +593,7 @@ check_for_reg_data_type_usage(migratorContext *ctx, Cluster whichCluster)
 								"			'pg_catalog.regprocedure'::pg_catalog.regtype, "
 								"			'pg_catalog.regoper'::pg_catalog.regtype, "
 								"			'pg_catalog.regoperator'::pg_catalog.regtype, "
-								"			'pg_catalog.regclass'::pg_catalog.regtype, "
+/*	allow						"			'pg_catalog.regclass'::pg_catalog.regtype, " */
 								/* regtype.oid is preserved, so 'regtype' is OK */
 								"			'pg_catalog.regconfig'::pg_catalog.regtype, "
 								"			'pg_catalog.regdictionary'::pg_catalog.regtype) AND "
diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/pgupgrade.sgml
index 74fba2e8e02..ae9050bdc9a 100644
--- a/doc/src/sgml/pgupgrade.sgml
+++ b/doc/src/sgml/pgupgrade.sgml
@@ -524,7 +524,7 @@ psql --username postgres --file script.sql postgres
    <application>pg_upgrade</> does not support migration of databases
    containing these <type>reg*</> OID-referencing system data types:
    <type>regproc</>, <type>regprocedure</>, <type>regoper</>,
-   <type>regoperator</>, <type>regclass</>, <type>regconfig</>, and
+   <type>regoperator</>, <type>regconfig</>, and
    <type>regdictionary</>.  (<type>regtype</> can be migrated.)
   </para>