diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
index a1dfa37be334e926af9e600537faae3cffd8aa18..a2c2e60db5c4ab6413a56e4747a51ed2b3af8a46 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
@@ -1825,14 +1825,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
    */
   public java.sql.ResultSet getCatalogs() throws SQLException
   {
-    // We don't use catalogs, so we simply return a single catalog name "".
-    Field f[] = new Field[1];
-    Vector v = new Vector();
-    byte[][] tuple = new byte[1][0];
-    f[0] = new Field(connection,"TABLE_CAT",iVarcharOid,32);
-    tuple[0] = "".getBytes();
-    v.addElement(tuple);
-    return new ResultSet(connection,f,v,"OK",1);
+      return connection.createStatement().executeQuery("select datname as TABLE_CAT from pg_database;");
   }
 
   /**
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
index b048ca6127fa0af641e5ef665e87cc2bf751b3b4..df8aaf849f43b8377f2e5cbd0c4e27705b202deb 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
@@ -1825,14 +1825,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
    */
   public java.sql.ResultSet getCatalogs() throws SQLException
   {
-    // We don't use catalogs, so we simply return a single catalog name "".
-    Field f[] = new Field[1];
-    Vector v = new Vector();
-    byte[][] tuple = new byte[1][0];
-    f[0] = new Field(connection,"TABLE_CAT",iVarcharOid,32);
-    tuple[0] = "".getBytes();
-    v.addElement(tuple);
-    return new ResultSet(connection,f,v,"OK",1);
+      return connection.createStatement().executeQuery("select datname as TABLE_CAT from pg_database;");
   }
 
   /**