diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index 7625353faf..4f4e059ee9 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2003, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.91 2004/04/22 14:34:38 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.92 2004/05/02 04:25:45 momjian Exp $
  */
 #include "postgres_fe.h"
 
@@ -124,6 +124,9 @@ main(int argc, char *argv[])
 		}
 	}
 
+#ifdef WIN32
+	setvbuf(stderr,NULL,_IONBF,0);
+#endif
 	pset.cur_cmd_source = stdin;
 	pset.cur_cmd_interactive = false;
 	pset.encoding = PQenv2encoding();