diff --git a/ChangeLog b/ChangeLog
index f366f2457..471b55c0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-21  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSPasteboard.m: Turn off warning message about launching
+	gpbs ... now that we use host-local connections and expect the
+	pastebaord server to be private to the user, there is no real reason
+	why it shouldn't be routinely launched on demand.
+
 2005-11-20  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/GSServicesManager.m: GSContactApplication()
diff --git a/Source/NSPasteboard.m b/Source/NSPasteboard.m
index 8451ae587..a24d359d5 100644
--- a/Source/NSPasteboard.m
+++ b/Source/NSPasteboard.m
@@ -1991,17 +1991,16 @@ static  NSMapTable              *mimeMap = NULL;
 	    }
 	  else
 	    {
-	      NSDistributedNotificationCenter *nc;
+	      NSNotificationCenter *nc;
 	      NSMutableArray *startIndicator;
 	      NSArray *args = nil;
 	      NSDate *timeoutDate;
 
-	      NSLog(@"\nI couldn't contact the pasteboard server for %@ -\n"
+	      NSDebugLLog(@"NSPasteboard",
+@"\nI couldn't contact the pasteboard server for %@ -\n"
 @"so I'm attempting to start one - which might take a few seconds.\n"
-@"Trying to launch gpbs from %@ or a machine/operating-system subdirectory.\n"
-@"It is recommended that you start the pasteboard server (gpbs) when\n"
-@"your windowing system is started up.\n", description,
-[cmd stringByDeletingLastPathComponent]);
+@"Trying to launch gpbs from %@ or a machine/operating-system subdirectory.\n",
+description, [cmd stringByDeletingLastPathComponent]);
 
 	      if ([host length] > 0)
 		{