diff -Nur jdbc.old/org/postgresql/Connection.java jdbc/org/postgresql/Connection.java
--- jdbc.old/org/postgresql/Connection.java	Thu Nov 16 18:25:52 2000
+++ jdbc/org/postgresql/Connection.java	Fri Nov 17 15:51:34 2000
@@ -268,7 +268,7 @@
       //
       firstWarning = null;
       
-      ExecSQL("set datestyle to 'ISO'");
+      ExecSQL("set datestyle to 'SQL'");
       
       // Initialise object handling
       initObjectTypes();
diff -Nur jdbc.old/org/postgresql/jdbc2/ResultSet.java jdbc/org/postgresql/jdbc2/ResultSet.java
--- jdbc.old/org/postgresql/jdbc2/ResultSet.java	Mon Nov 13 17:48:43 2000
+++ jdbc/org/postgresql/jdbc2/ResultSet.java	Fri Nov 17 15:52:49 2000
@@ -465,34 +465,7 @@
     if(s==null)
 	return null;
     
-    // This works, but it's commented out because Michael Stephenson's
-    // solution is better still:
-    //SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-// Modification by Jan Thomae
-    String sub = s.substring(s.length() - 3, s.length()-2);
-    if (sub.equals("+") || sub.equals("-")) {
-            s = s.substring(0, s.length()-3) + "GMT"+ s.substring(s.length()-3, s.length())+":00";
-    }
-// -------
-       // Michael Stephenson's solution:
-    SimpleDateFormat df = null;
-
-// Modification by Jan Thomae
-    if (s.length()>27) {
-    df = new SimpleDateFormat("yyyy-MM-dd HH:mm:sszzzzzzzzz");  
-    } else              
-// -------
-    if (s.length()>21 && s.indexOf('.') != -1) {
-	df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSzzz");
-    } else if (s.length()>19 && s.indexOf('.') == -1) {
-	df = new SimpleDateFormat("yyyy-MM-dd HH:MM:sszzz");
-    } else if (s.length()>19 && s.indexOf('.') != -1) {
-	df = new SimpleDateFormat("yyyy-MM-dd HH:MM:ss.SS");
-    } else if (s.length()>10 && s.length()<=18) {
-	df = new SimpleDateFormat("yyyy-MM-dd HH:MM:ss");
-    } else {
-	df = new SimpleDateFormat("yyyy-MM-dd");
-    }
+    df = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss.SS zzzz");  
     
     try {
 	return new Timestamp(df.parse(s).getTime());