diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 51b6d3a..87dadbf 100644
*** a/src/bin/pg_dump/pg_dump.c
--- b/src/bin/pg_dump/pg_dump.c
*************** getTypes(Archive *fout, int *numTypes)
*** 3513,3519 ****
  	else if (fout->remoteVersion >= 80300)
  	{
  		appendPQExpBuffer(query, "SELECT tableoid, oid, typname, "
! 						  "typnamespace, '{=U}' AS typacl, "
  						  "(%s typowner) AS rolname, "
  						  "typinput::oid AS typinput, "
  						  "typoutput::oid AS typoutput, typelem, typrelid, "
--- 3513,3519 ----
  	else if (fout->remoteVersion >= 80300)
  	{
  		appendPQExpBuffer(query, "SELECT tableoid, oid, typname, "
! 						  "typnamespace, NULL AS typacl, "
  						  "(%s typowner) AS rolname, "
  						  "typinput::oid AS typinput, "
  						  "typoutput::oid AS typoutput, typelem, typrelid, "
*************** getTypes(Archive *fout, int *numTypes)
*** 3528,3534 ****
  	else if (fout->remoteVersion >= 70300)
  	{
  		appendPQExpBuffer(query, "SELECT tableoid, oid, typname, "
! 						  "typnamespace, '{=U}' AS typacl, "
  						  "(%s typowner) AS rolname, "
  						  "typinput::oid AS typinput, "
  						  "typoutput::oid AS typoutput, typelem, typrelid, "
--- 3528,3534 ----
  	else if (fout->remoteVersion >= 70300)
  	{
  		appendPQExpBuffer(query, "SELECT tableoid, oid, typname, "
! 						  "typnamespace, NULL AS typacl, "
  						  "(%s typowner) AS rolname, "
  						  "typinput::oid AS typinput, "
  						  "typoutput::oid AS typoutput, typelem, typrelid, "
*************** getTypes(Archive *fout, int *numTypes)
*** 3542,3548 ****
  	else if (fout->remoteVersion >= 70100)
  	{
  		appendPQExpBuffer(query, "SELECT tableoid, oid, typname, "
! 						  "0::oid AS typnamespace, '{=U}' AS typacl, "
  						  "(%s typowner) AS rolname, "
  						  "typinput::oid AS typinput, "
  						  "typoutput::oid AS typoutput, typelem, typrelid, "
--- 3542,3548 ----
  	else if (fout->remoteVersion >= 70100)
  	{
  		appendPQExpBuffer(query, "SELECT tableoid, oid, typname, "
! 						  "0::oid AS typnamespace, NULL AS typacl, "
  						  "(%s typowner) AS rolname, "
  						  "typinput::oid AS typinput, "
  						  "typoutput::oid AS typoutput, typelem, typrelid, "
*************** getTypes(Archive *fout, int *numTypes)
*** 3558,3564 ****
  		appendPQExpBuffer(query, "SELECT "
  		 "(SELECT oid FROM pg_class WHERE relname = 'pg_type') AS tableoid, "
  						  "oid, typname, "
! 						  "0::oid AS typnamespace, '{=U}' AS typacl, "
  						  "(%s typowner) AS rolname, "
  						  "typinput::oid AS typinput, "
  						  "typoutput::oid AS typoutput, typelem, typrelid, "
--- 3558,3564 ----
  		appendPQExpBuffer(query, "SELECT "
  		 "(SELECT oid FROM pg_class WHERE relname = 'pg_type') AS tableoid, "
  						  "oid, typname, "
! 						  "0::oid AS typnamespace, NULL AS typacl, "
  						  "(%s typowner) AS rolname, "
  						  "typinput::oid AS typinput, "
  						  "typoutput::oid AS typoutput, typelem, typrelid, "
*************** getAggregates(Archive *fout, DumpOptions
*** 4249,4255 ****
  				  "CASE WHEN aggbasetype = 0 THEN 0 ELSE 1 END AS pronargs, "
  						  "aggbasetype AS proargtypes, "
  						  "(%s aggowner) AS rolname, "
! 						  "'{=X}' AS aggacl "
  						  "FROM pg_aggregate "
  						  "where oid > '%u'::oid",
  						  username_subquery,
--- 4249,4255 ----
  				  "CASE WHEN aggbasetype = 0 THEN 0 ELSE 1 END AS pronargs, "
  						  "aggbasetype AS proargtypes, "
  						  "(%s aggowner) AS rolname, "
! 						  "NULL AS aggacl "
  						  "FROM pg_aggregate "
  						  "where oid > '%u'::oid",
  						  username_subquery,
*************** getAggregates(Archive *fout, DumpOptions
*** 4264,4270 ****
  				  "CASE WHEN aggbasetype = 0 THEN 0 ELSE 1 END AS pronargs, "
  						  "aggbasetype AS proargtypes, "
  						  "(%s aggowner) AS rolname, "
! 						  "'{=X}' AS aggacl "
  						  "FROM pg_aggregate "
  						  "where oid > '%u'::oid",
  						  username_subquery,
--- 4264,4270 ----
  				  "CASE WHEN aggbasetype = 0 THEN 0 ELSE 1 END AS pronargs, "
  						  "aggbasetype AS proargtypes, "
  						  "(%s aggowner) AS rolname, "
! 						  "NULL AS aggacl "
  						  "FROM pg_aggregate "
  						  "where oid > '%u'::oid",
  						  username_subquery,
*************** getFuncs(Archive *fout, DumpOptions *dop
*** 4408,4414 ****
  		appendPQExpBuffer(query,
  						  "SELECT tableoid, oid, proname, prolang, "
  						  "pronargs, proargtypes, prorettype, "
! 						  "'{=X}' AS proacl, "
  						  "0::oid AS pronamespace, "
  						  "(%s proowner) AS rolname "
  						  "FROM pg_proc "
--- 4408,4414 ----
  		appendPQExpBuffer(query,
  						  "SELECT tableoid, oid, proname, prolang, "
  						  "pronargs, proargtypes, prorettype, "
! 						  "NULL AS proacl, "
  						  "0::oid AS pronamespace, "
  						  "(%s proowner) AS rolname "
  						  "FROM pg_proc "
*************** getFuncs(Archive *fout, DumpOptions *dop
*** 4424,4430 ****
  						  " WHERE relname = 'pg_proc') AS tableoid, "
  						  "oid, proname, prolang, "
  						  "pronargs, proargtypes, prorettype, "
! 						  "'{=X}' AS proacl, "
  						  "0::oid AS pronamespace, "
  						  "(%s proowner) AS rolname "
  						  "FROM pg_proc "
--- 4424,4430 ----
  						  " WHERE relname = 'pg_proc') AS tableoid, "
  						  "oid, proname, prolang, "
  						  "pronargs, proargtypes, prorettype, "
! 						  "NULL AS proacl, "
  						  "0::oid AS pronamespace, "
  						  "(%s proowner) AS rolname "
  						  "FROM pg_proc "
*************** getProcLangs(Archive *fout, int *numProc
*** 6317,6323 ****
  		/* pg_language has a laninline column */
  		appendPQExpBuffer(query, "SELECT tableoid, oid, "
  						  "lanname, lanpltrusted, lanplcallfoid, "
! 						  "laninline, lanvalidator,  lanacl, "
  						  "(%s lanowner) AS lanowner "
  						  "FROM pg_language "
  						  "WHERE lanispl "
--- 6317,6323 ----
  		/* pg_language has a laninline column */
  		appendPQExpBuffer(query, "SELECT tableoid, oid, "
  						  "lanname, lanpltrusted, lanplcallfoid, "
! 						  "laninline, lanvalidator, lanacl, "
  						  "(%s lanowner) AS lanowner "
  						  "FROM pg_language "
  						  "WHERE lanispl "
*************** getProcLangs(Archive *fout, int *numProc
*** 6329,6335 ****
  		/* pg_language has a lanowner column */
  		appendPQExpBuffer(query, "SELECT tableoid, oid, "
  						  "lanname, lanpltrusted, lanplcallfoid, "
! 						  "lanvalidator,  lanacl, "
  						  "(%s lanowner) AS lanowner "
  						  "FROM pg_language "
  						  "WHERE lanispl "
--- 6329,6335 ----
  		/* pg_language has a lanowner column */
  		appendPQExpBuffer(query, "SELECT tableoid, oid, "
  						  "lanname, lanpltrusted, lanplcallfoid, "
! 						  "0 AS laninline, lanvalidator, lanacl, "
  						  "(%s lanowner) AS lanowner "
  						  "FROM pg_language "
  						  "WHERE lanispl "
*************** getProcLangs(Archive *fout, int *numProc
*** 6339,6345 ****
  	else if (fout->remoteVersion >= 80100)
  	{
  		/* Languages are owned by the bootstrap superuser, OID 10 */
! 		appendPQExpBuffer(query, "SELECT tableoid, oid, *, "
  						  "(%s '10') AS lanowner "
  						  "FROM pg_language "
  						  "WHERE lanispl "
--- 6339,6347 ----
  	else if (fout->remoteVersion >= 80100)
  	{
  		/* Languages are owned by the bootstrap superuser, OID 10 */
! 		appendPQExpBuffer(query, "SELECT tableoid, oid, "
! 						  "lanname, lanpltrusted, lanplcallfoid, "
! 						  "0 AS laninline, lanvalidator, lanacl, "
  						  "(%s '10') AS lanowner "
  						  "FROM pg_language "
  						  "WHERE lanispl "
*************** getProcLangs(Archive *fout, int *numProc
*** 6349,6375 ****
  	else if (fout->remoteVersion >= 70400)
  	{
  		/* Languages are owned by the bootstrap superuser, sysid 1 */
! 		appendPQExpBuffer(query, "SELECT tableoid, oid, *, "
  						  "(%s '1') AS lanowner "
  						  "FROM pg_language "
  						  "WHERE lanispl "
  						  "ORDER BY oid",
  						  username_subquery);
  	}
! 	else if (fout->remoteVersion >= 70100)
  	{
  		/* No clear notion of an owner at all before 7.4 ... */
! 		appendPQExpBufferStr(query, "SELECT tableoid, oid, * FROM pg_language "
! 							 "WHERE lanispl "
! 							 "ORDER BY oid");
  	}
  	else
  	{
! 		appendPQExpBufferStr(query, "SELECT "
! 							 "(SELECT oid FROM pg_class WHERE relname = 'pg_language') AS tableoid, "
! 							 "oid, * FROM pg_language "
! 							 "WHERE lanispl "
! 							 "ORDER BY oid");
  	}
  
  	res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK);
--- 6351,6397 ----
  	else if (fout->remoteVersion >= 70400)
  	{
  		/* Languages are owned by the bootstrap superuser, sysid 1 */
! 		appendPQExpBuffer(query, "SELECT tableoid, oid, "
! 						  "lanname, lanpltrusted, lanplcallfoid, "
! 						  "0 AS laninline, lanvalidator, lanacl, "
  						  "(%s '1') AS lanowner "
  						  "FROM pg_language "
  						  "WHERE lanispl "
  						  "ORDER BY oid",
  						  username_subquery);
  	}
! 	else if (fout->remoteVersion >= 70300)
  	{
  		/* No clear notion of an owner at all before 7.4 ... */
! 		appendPQExpBuffer(query, "SELECT tableoid, oid, "
! 						  "lanname, lanpltrusted, lanplcallfoid, "
! 						  "0 AS laninline, lanvalidator, lanacl, "
! 						  "NULL AS lanowner "
! 						  "FROM pg_language "
! 						  "WHERE lanispl "
! 						  "ORDER BY oid");
! 	}
! 	else if (fout->remoteVersion >= 70100)
! 	{
! 		appendPQExpBuffer(query, "SELECT tableoid, oid, "
! 						  "lanname, lanpltrusted, lanplcallfoid, "
! 						"0 AS laninline, 0 AS lanvalidator, NULL AS lanacl, "
! 						  "NULL AS lanowner "
! 						  "FROM pg_language "
! 						  "WHERE lanispl "
! 						  "ORDER BY oid");
  	}
  	else
  	{
! 		appendPQExpBuffer(query, "SELECT "
! 						  "(SELECT oid FROM pg_class WHERE relname = 'pg_language') AS tableoid, "
! 						  "oid, "
! 						  "lanname, lanpltrusted, lanplcallfoid, "
! 						"0 AS laninline, 0 AS lanvalidator, NULL AS lanacl, "
! 						  "NULL AS lanowner "
! 						  "FROM pg_language "
! 						  "WHERE lanispl "
! 						  "ORDER BY oid");
  	}
  
  	res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK);
*************** getProcLangs(Archive *fout, int *numProc
*** 6385,6391 ****
  	i_lanname = PQfnumber(res, "lanname");
  	i_lanpltrusted = PQfnumber(res, "lanpltrusted");
  	i_lanplcallfoid = PQfnumber(res, "lanplcallfoid");
- 	/* these may fail and return -1: */
  	i_laninline = PQfnumber(res, "laninline");
  	i_lanvalidator = PQfnumber(res, "lanvalidator");
  	i_lanacl = PQfnumber(res, "lanacl");
--- 6407,6412 ----
*************** getProcLangs(Archive *fout, int *numProc
*** 6401,6422 ****
  		planginfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_lanname));
  		planginfo[i].lanpltrusted = *(PQgetvalue(res, i, i_lanpltrusted)) == 't';
  		planginfo[i].lanplcallfoid = atooid(PQgetvalue(res, i, i_lanplcallfoid));
! 		if (i_laninline >= 0)
! 			planginfo[i].laninline = atooid(PQgetvalue(res, i, i_laninline));
! 		else
! 			planginfo[i].laninline = InvalidOid;
! 		if (i_lanvalidator >= 0)
! 			planginfo[i].lanvalidator = atooid(PQgetvalue(res, i, i_lanvalidator));
! 		else
! 			planginfo[i].lanvalidator = InvalidOid;
! 		if (i_lanacl >= 0)
! 			planginfo[i].lanacl = pg_strdup(PQgetvalue(res, i, i_lanacl));
! 		else
! 			planginfo[i].lanacl = pg_strdup("{=U}");
! 		if (i_lanowner >= 0)
! 			planginfo[i].lanowner = pg_strdup(PQgetvalue(res, i, i_lanowner));
! 		else
! 			planginfo[i].lanowner = pg_strdup("");
  
  		if (fout->remoteVersion < 70300)
  		{
--- 6422,6431 ----
  		planginfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_lanname));
  		planginfo[i].lanpltrusted = *(PQgetvalue(res, i, i_lanpltrusted)) == 't';
  		planginfo[i].lanplcallfoid = atooid(PQgetvalue(res, i, i_lanplcallfoid));
! 		planginfo[i].laninline = atooid(PQgetvalue(res, i, i_laninline));
! 		planginfo[i].lanvalidator = atooid(PQgetvalue(res, i, i_lanvalidator));
! 		planginfo[i].lanacl = pg_strdup(PQgetvalue(res, i, i_lanacl));
! 		planginfo[i].lanowner = pg_strdup(PQgetvalue(res, i, i_lanowner));
  
  		if (fout->remoteVersion < 70300)
  		{