diff --git a/pgjdbc/src/main/java/org/postgresql/jdbc/TypeInfoCache.java b/pgjdbc/src/main/java/org/postgresql/jdbc/TypeInfoCache.java
index 7702ccdd080b6ba79717217fa64173d01783289f..e3894ed4fc2e288244bf7cba89cce2aadc7e45c8 100644
--- a/pgjdbc/src/main/java/org/postgresql/jdbc/TypeInfoCache.java
+++ b/pgjdbc/src/main/java/org/postgresql/jdbc/TypeInfoCache.java
@@ -155,6 +155,11 @@ public class TypeInfoCache implements TypeInfo {
       String javaClass, Integer arrayOid) {
     _pgNameToJavaClass.put(pgTypeName, javaClass);
     _pgNameToOid.put(pgTypeName, oid);
+    if (oid == Oid.TIMESTAMP) {
+      pgTypeName = "datetime";
+    } else if (oid == Oid.TIMESTAMPTZ) {
+      pgTypeName = "timestamp";
+    }
     _oidToPgName.put(oid, pgTypeName);
     _pgArrayToPgType.put(arrayOid, oid);
     _pgNameToSQLType.put(pgTypeName, sqlType);