diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index afe953cd6d4..4a56f4ecf3b 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.443.4.9 2007/07/19 19:15:25 adunstan Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.443.4.10 2007/08/02 23:20:22 adunstan Exp $
  *
  * NOTES
  *
@@ -3201,6 +3201,15 @@ SubPostmasterMain(int argc, char *argv[])
 
 	MyProcPid = getpid();		/* reset MyProcPid */
 
+ 	/* make sure stderr is in binary mode before anything can
+ 	 * possibly be written to it, in case it's actually the syslogger pipe,
+ 	 * so the pipe chunking protocol isn't disturbed. Non-logpipe data
+ 	 * gets translated on redirection (e.g. via pg_ctl -l) anyway.
+ 	 */
+#ifdef WIN32
+ 	_setmode(fileno(stderr),_O_BINARY);
+#endif
+ 
 	/* In EXEC_BACKEND case we will not have inherited these settings */
 	IsPostmasterEnvironment = true;
 	whereToSendOutput = None;
diff --git a/src/backend/postmaster/syslogger.c b/src/backend/postmaster/syslogger.c
index 342becb7dae..9c570e513aa 100644
--- a/src/backend/postmaster/syslogger.c
+++ b/src/backend/postmaster/syslogger.c
@@ -18,7 +18,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.12.4.3 2007/07/19 19:15:25 adunstan Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.12.4.4 2007/08/02 23:20:22 adunstan Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -198,6 +198,15 @@ SysLoggerMain(int argc, char *argv[])
 		close(fd);
 	}
 
+	/* Syslogger's own stderr can't be the syslogPipe, so set it back to
+	 * text mode if we didn't just close it. 
+	 * (It was set to binary in SubPostmasterMain).
+	 */
+#ifdef WIN32
+	else
+		_setmode(_fileno(stderr),_O_TEXT);
+#endif
+
 	/*
 	 * Also close our copy of the write end of the pipe.  This is needed
 	 * to ensure we can detect pipe EOF correctly.	(But note that in the
@@ -549,14 +558,20 @@ SysLogger_Start(void)
 #else
 				int			fd;
 
+				/*
+				 * open the pipe in binary mode and make sure
+				 * stderr is binary after it's been dup'ed into, to avoid
+				 * disturbing the pipe chunking protocol.
+				 */
 				fflush(stderr);
 				fd = _open_osfhandle((long) syslogPipe[1],
-									 _O_APPEND | _O_TEXT);
+									 _O_APPEND | _O_BINARY);
 				if (dup2(fd, _fileno(stderr)) < 0)
 					ereport(FATAL,
 							(errcode_for_file_access(),
 							 errmsg("could not redirect stderr: %m")));
 				close(fd);
+				_setmode(_fileno(stderr),_O_BINARY);
 				/* Now we are done with the write end of the pipe. */
 				CloseHandle(syslogPipe[1]);
 				syslogPipe[1] = 0;
@@ -644,7 +659,7 @@ syslogger_parseArgs(int argc, char *argv[])
 	fd = atoi(*argv++);
 	if (fd != 0)
 	{
-		fd = _open_osfhandle(fd, _O_APPEND);
+		fd = _open_osfhandle(fd, _O_APPEND | _O_TEXT);
 		if (fd > 0)
 		{
 			syslogFile = fdopen(fd, "a");
@@ -1047,6 +1062,10 @@ logfile_rotate(bool time_based_rotation)
 
 	setvbuf(fh, NULL, LBF_MODE, 0);
 
+#ifdef WIN32
+	_setmode(_fileno(fh), _O_TEXT); /* use CRLF line endings on Windows */
+#endif
+
 	/* On Windows, need to interlock against data-transfer thread */
 #ifdef WIN32
 	EnterCriticalSection(&sysfileSection);