diff --git a/ChangeLog b/ChangeLog
index 1095fbf..774ca76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-20 Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Tools/gpbs.m: Remove use of private method for connection keepalive.
+	Keepalive is now enabled in base when necessary.
+
 2008-12-15  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
 	* Source/x11/XGServerEvent.m (-processEvent:): Ignore
diff --git a/Tools/gpbs.m b/Tools/gpbs.m
index 6875aec..c2a4eab 100644
--- a/Tools/gpbs.m
+++ b/Tools/gpbs.m
@@ -130,10 +130,6 @@ NSConnection		*conn = nil;
 NSLock			*dictionary_lock = nil;
 NSMutableDictionary	*pasteboards = nil;
 
-@interface	NSConnection (Private)
-- (void) _enableKeepalive;
-@end
-
 @interface	NSPasteboard (GNULocal)
 + (void) _localServer: (id<GSPasteboardSvr>)s;
 @end
@@ -1011,13 +1007,6 @@ NSMutableDictionary	*pasteboards = nil;
 	   name: NSConnectionDidDieNotification
 	 object: newConn];
   [newConn setDelegate: self];
-  /* For ms-windows we need to enable keepalive on the connection so that
-   * we will find out if the remote end goes away.
-   */
-  if ([newConn respondsToSelector: @selector(_enableKeepalive)])
-    {
-      [newConn _enableKeepalive];
-    }
   return YES;
 }