diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c
new file mode 100644
index 567c64e..ca357e7
*** a/contrib/pg_upgrade/info.c
--- b/contrib/pg_upgrade/info.c
*************** get_rel_infos(migratorContext *ctx, cons
*** 326,332 ****
  			 "	ON c.relnamespace = n.oid "
  			 "   LEFT OUTER JOIN pg_catalog.pg_tablespace t "
  			 "	ON c.reltablespace = t.oid "
! 			 "WHERE (( n.nspname NOT IN ('pg_catalog', 'information_schema') "
  			 "	AND c.oid >= %u "
  			 "	) OR ( "
  			 "	n.nspname = 'pg_catalog' "
--- 326,335 ----
  			 "	ON c.relnamespace = n.oid "
  			 "   LEFT OUTER JOIN pg_catalog.pg_tablespace t "
  			 "	ON c.reltablespace = t.oid "
! 			 "WHERE (( "
! 			 /* exclude pg_catalog and pg_temp_ (could be orphaned tables) */
! 			 "	n.nspname !~ '^pg_' "
! 			 "	AND n.nspname != 'information_schema' "
  			 "	AND c.oid >= %u "
  			 "	) OR ( "
  			 "	n.nspname = 'pg_catalog' "
diff --git a/contrib/pg_upgrade/version_old_8_3.c b/contrib/pg_upgrade/version_old_8_3.c
new file mode 100644
index 6ca266c..930f76d
*** a/contrib/pg_upgrade/version_old_8_3.c
--- b/contrib/pg_upgrade/version_old_8_3.c
*************** old_8_3_check_for_name_data_type_usage(m
*** 61,67 ****
  								"		NOT a.attisdropped AND "
  								"		a.atttypid = 'pg_catalog.name'::pg_catalog.regtype AND "
  								"		c.relnamespace = n.oid AND "
! 							  "		n.nspname != 'pg_catalog' AND "
  						 "		n.nspname != 'information_schema'");
  
  		ntups = PQntuples(res);
--- 61,68 ----
  								"		NOT a.attisdropped AND "
  								"		a.atttypid = 'pg_catalog.name'::pg_catalog.regtype AND "
  								"		c.relnamespace = n.oid AND "
! 							 /* exclude pg_catalog and pg_temp_ (could be orphaned tables) */
! 								"   n.nspname !~ '^pg_' AND "
  						 "		n.nspname != 'information_schema'");
  
  		ntups = PQntuples(res);
*************** old_8_3_check_for_tsquery_usage(migrator
*** 151,157 ****
  								"		NOT a.attisdropped AND "
  								"		a.atttypid = 'pg_catalog.tsquery'::pg_catalog.regtype AND "
  								"		c.relnamespace = n.oid AND "
! 							  "		n.nspname != 'pg_catalog' AND "
  						 "		n.nspname != 'information_schema'");
  
  		ntups = PQntuples(res);
--- 152,159 ----
  								"		NOT a.attisdropped AND "
  								"		a.atttypid = 'pg_catalog.tsquery'::pg_catalog.regtype AND "
  								"		c.relnamespace = n.oid AND "
! 							 /* exclude pg_catalog and pg_temp_ (could be orphaned tables) */
! 								"   n.nspname !~ '^pg_' AND "
  						 "		n.nspname != 'information_schema'");
  
  		ntups = PQntuples(res);
*************** old_8_3_rebuild_tsvector_tables(migrator
*** 250,256 ****
  								"		NOT a.attisdropped AND "
  								"		a.atttypid = 'pg_catalog.tsvector'::pg_catalog.regtype AND "
  								"		c.relnamespace = n.oid AND "
! 							  "		n.nspname != 'pg_catalog' AND "
  						 "		n.nspname != 'information_schema'");
  
  /*
--- 252,259 ----
  								"		NOT a.attisdropped AND "
  								"		a.atttypid = 'pg_catalog.tsvector'::pg_catalog.regtype AND "
  								"		c.relnamespace = n.oid AND "
! 							 /* exclude pg_catalog and pg_temp_ (could be orphaned tables) */
! 								"   n.nspname !~ '^pg_' AND "
  						 "		n.nspname != 'information_schema'");
  
  /*
*************** old_8_3_rebuild_tsvector_tables(migrator
*** 268,274 ****
  								"		NOT a.attisdropped AND "		\
  								"		a.atttypid = 'pg_catalog.tsvector'::pg_catalog.regtype AND " \
  								"		c.relnamespace = n.oid AND "	\
! 								"		n.nspname != 'pg_catalog' AND " \
  								"		n.nspname != 'information_schema') "
  
  		ntups = PQntuples(res);
--- 271,277 ----
  								"		NOT a.attisdropped AND "		\
  								"		a.atttypid = 'pg_catalog.tsvector'::pg_catalog.regtype AND " \
  								"		c.relnamespace = n.oid AND "	\
! 								"       n.nspname !~ '^pg_' AND "		\
  								"		n.nspname != 'information_schema') "
  
  		ntups = PQntuples(res);
*************** old_8_3_create_sequence_script(migratorC
*** 638,644 ****
  								"		pg_catalog.pg_namespace n "
  								"WHERE	c.relkind = 'S' AND "
  								"		c.relnamespace = n.oid AND "
! 							  "		n.nspname != 'pg_catalog' AND "
  						 "		n.nspname != 'information_schema'");
  
  		ntups = PQntuples(res);
--- 641,648 ----
  								"		pg_catalog.pg_namespace n "
  								"WHERE	c.relkind = 'S' AND "
  								"		c.relnamespace = n.oid AND "
! 							 /* exclude pg_catalog and pg_temp_ (could be orphaned tables) */
! 								"   n.nspname !~ '^pg_' AND "
  						 "		n.nspname != 'information_schema'");
  
  		ntups = PQntuples(res);