diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
new file mode 100644
index 3e3b433..ec7246a
*** a/src/bin/pg_dump/pg_dumpall.c
--- b/src/bin/pg_dump/pg_dumpall.c
*************** dumpCreateDB(PGconn *conn)
*** 1417,1432 ****
  
  			appendPQExpBufferStr(buf, ";\n");
  
! 			if (binary_upgrade)
! 			{
! 				appendPQExpBufferStr(buf, "-- For binary upgrade, set datfrozenxid and datminmxid.\n");
! 				appendPQExpBuffer(buf, "UPDATE pg_catalog.pg_database "
! 								"SET datfrozenxid = '%u', datminmxid = '%u' "
! 								  "WHERE datname = ",
! 								  dbfrozenxid, dbminmxid);
! 				appendStringLiteralConn(buf, dbname, conn);
! 				appendPQExpBufferStr(buf, ";\n");
! 			}
  		}
  
  		if (!skip_acls &&
--- 1417,1433 ----
  
  			appendPQExpBufferStr(buf, ";\n");
  
! 		}
! 
! 		if (binary_upgrade)
! 		{
! 			appendPQExpBufferStr(buf, "-- For binary upgrade, set datfrozenxid and datminmxid.\n");
! 			appendPQExpBuffer(buf, "UPDATE pg_catalog.pg_database "
! 							"SET datfrozenxid = '%u', datminmxid = '%u' "
! 							  "WHERE datname = ",
! 							  dbfrozenxid, dbminmxid);
! 			appendStringLiteralConn(buf, dbname, conn);
! 			appendPQExpBufferStr(buf, ";\n");
  		}
  
  		if (!skip_acls &&