diff --git a/ChangeLog b/ChangeLog
index 8c4be4a5d..f08ee9ffa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-08  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/GSServicesManager.m: avoid use of deprecated method.
+
 2006-03-05  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSScreen.m: ([-visibleFrame]) fix to work when using
diff --git a/Source/GSServicesManager.m b/Source/GSServicesManager.m
index ccceb3e53..474f3a296 100644
--- a/Source/GSServicesManager.m
+++ b/Source/GSServicesManager.m
@@ -161,8 +161,14 @@ NSRegisterServicesProvider(id provider, NSString *name)
       DESTROY(listenerConnection);
     }
 
-  listenerConnection = [NSConnection newRegisteringAtName: name
-    withRootObject: [GSListener listener]];
+  listenerConnection = [[NSConnection alloc]
+    initWithReceivePort: [NSPort port] sendPort: nil];
+  [listenerConnection setRootObject: [GSListener listener]];
+  if ([listenerConnection registerName: name] == NO)
+    {
+      DESTROY(listenerConnection);
+    }
+
   if (listenerConnection != nil)
     {
       RETAIN(listenerConnection);