diff --git a/ChangeLog b/ChangeLog
index 8562620a3..03b7a2be9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-16 Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/win32/NSMessagePort.m: Don't use NSLog() to report error
+	when writing to mailslot ... it's usually just that the remote
+	end has terminated, so invalidating the port silently is better.
+
 2009-06-13 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Headers/Foundation/NSKeyedArchiver.h:
diff --git a/Source/win32/NSMessagePort.m b/Source/win32/NSMessagePort.m
index ec70ac77f..69231d94f 100644
--- a/Source/win32/NSMessagePort.m
+++ b/Source/win32/NSMessagePort.m
@@ -872,7 +872,11 @@ again:
 	}
       else if ((errno = GetLastError()) != ERROR_IO_PENDING)
 	{
-	  NSLog(@"unable to write to mailslot '%@' - %@",
+	  /* This is probably an end of file
+	   * eg. when the process at the other end has terminated.
+	   */
+	  NSDebugMLog(@"NSMessagePort",
+	    @"unable to write to mailslot '%@' - %@",
 	    this->name, [NSError _last]);
 	  [self invalidate];
 	}