diff --git a/ChangeLog b/ChangeLog
index 240c657cb..88400d2ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Tue Jun 15 20:55:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
+
+	* Source/GSServicesManager.m: Use NSNotificationCenter properly.
+	* Source/NSColor.m: Use NSNotificationCenter properly.
+	* Source/NSInterfaceStyle.m: Use NSNotificationCenter properly.
+	* Source/NSPasteboard.m: Use NSNotificationCenter properly.
+	* Source/NSWorkspace.m: Use NSNotificationCenter properly.
+	* Tools/gpbs.m: Use NSNotificationCenter properly.
+
 Tue Jun 15  9:00:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	* Source/NSWindow.m: Handle dnd registration for the window by using
diff --git a/Source/GSServicesManager.m b/Source/GSServicesManager.m
index b35b104c8..de87310e7 100644
--- a/Source/GSServicesManager.m
+++ b/Source/GSServicesManager.m
@@ -101,9 +101,10 @@ NSUnregisterServicesProvider(NSString *name)
        *        the given port name.
        */
       [[NSPortNameServer defaultPortNameServer] removePortForName: name];
-      [NSNotificationCenter removeObserver: [GSListener class]
-                                      name: NSConnectionDidDieNotification
-                                    object: listenerConnection];
+      [[NSNotificationCenter defaultCenter]
+	removeObserver: [GSListener class]
+		  name: NSConnectionDidDieNotification
+		object: listenerConnection];
       [listenerConnection release];
       listenerConnection = nil;
     }
@@ -120,9 +121,10 @@ NSRegisterServicesProvider(id provider, NSString *name)
        *	the given port name.
        */
       [[NSPortNameServer defaultPortNameServer] removePortForName: name];
-      [NSNotificationCenter removeObserver: [GSListener class]
-				      name: NSConnectionDidDieNotification
-				    object: listenerConnection];
+      [[NSNotificationCenter defaultCenter]
+	removeObserver: [GSListener class]
+		  name: NSConnectionDidDieNotification
+		object: listenerConnection];
       [listenerConnection release];
       listenerConnection = nil;
     }
@@ -133,7 +135,7 @@ NSRegisterServicesProvider(id provider, NSString *name)
       if (listenerConnection)
 	{
 	  [listenerConnection retain];
-	  [NotificationDispatcher
+	  [[NSNotificationCenter defaultCenter]
                     addObserver: [GSListener class]
 		       selector: @selector(connectionBecameInvalid:)
 			   name: NSConnectionDidDieNotification
@@ -159,9 +161,10 @@ NSRegisterServicesProvider(id provider, NSString *name)
   NSAssert(listenerConnection==[notification object],
 	NSInternalInconsistencyException);
 
-  [NSNotificationCenter removeObserver: self
-				  name: NSConnectionDidDieNotification
-				object: listenerConnection];
+  [[NSNotificationCenter defaultCenter]
+    removeObserver: self
+	      name: NSConnectionDidDieNotification
+	    object: listenerConnection];
   [listenerConnection release];
   listenerConnection = nil;
   return self;
diff --git a/Source/NSColor.m b/Source/NSColor.m
index 2c1e9bbb5..65f814e10 100644
--- a/Source/NSColor.m
+++ b/Source/NSColor.m
@@ -117,10 +117,11 @@ static NSMutableDictionary	*colorStrings = nil;
       // ensure user defaults are loaded, then use them and watch for changes.
       [NSUserDefaults standardUserDefaults];
       [self defaultsDidChange: nil];
-      [NSNotificationCenter addObserver: self
-			       selector: @selector(defaultsDidChange:)
-				   name: NSUserDefaultsDidChangeNotification
-				 object: nil];
+      [[NSNotificationCenter defaultCenter]
+	addObserver: self
+	   selector: @selector(defaultsDidChange:)
+	       name: NSUserDefaultsDidChangeNotification
+	     object: nil];
     }
 }
 
diff --git a/Source/NSInterfaceStyle.m b/Source/NSInterfaceStyle.m
index 83c38e2e0..87c70dcf2 100644
--- a/Source/NSInterfaceStyle.m
+++ b/Source/NSInterfaceStyle.m
@@ -137,10 +137,11 @@ NSInterfaceStyleForKey(NSString *key, NSResponder *responder)
 
       [NSUserDefaults standardUserDefaults];
       [self defaultsDidChange: nil];
-      [NSNotificationCenter addObserver: self
-			       selector: @selector(defaultsDidChange:)
-				   name: NSUserDefaultsDidChangeNotification
-				 object: nil];
+      [[NSNotificationCenter defaultCenter]
+	addObserver: self
+	   selector: @selector(defaultsDidChange:)
+	       name: NSUserDefaultsDidChangeNotification
+	     object: nil];
     }
 }
 
diff --git a/Source/NSPasteboard.m b/Source/NSPasteboard.m
index 21337a457..76ebca3fc 100644
--- a/Source/NSPasteboard.m
+++ b/Source/NSPasteboard.m
@@ -94,9 +94,10 @@ static	id<GSPasteboardSvr>	the_server = nil;
   id	obj = the_server;
 
   the_server = nil;
-  [NSNotificationCenter removeObserver: self
-              			  name: NSConnectionDidDieNotification
-              			object: [notification object]];
+  [[NSNotificationCenter defaultCenter]
+    removeObserver: self
+	      name: NSConnectionDidDieNotification
+	    object: [notification object]];
   [obj release];
   return self;
 }
@@ -119,10 +120,11 @@ static	id<GSPasteboardSvr>	the_server = nil;
 	{
 	  NSConnection*	conn = [(id)the_server connectionForProxy];
 
-	  [NSNotificationCenter addObserver: self
-				   selector: @selector(_lostServer:)
-				       name: NSConnectionDidDieNotification
-				     object: conn];
+	  [[NSNotificationCenter defaultCenter]
+	    addObserver: self
+	       selector: @selector(_lostServer:)
+		   name: NSConnectionDidDieNotification
+		 object: conn];
 	}
       else
 	{
diff --git a/Source/NSWorkspace.m b/Source/NSWorkspace.m
index 9e369f600..886f1882e 100644
--- a/Source/NSWorkspace.m
+++ b/Source/NSWorkspace.m
@@ -162,10 +162,11 @@ static NSString			*_rootPath = @"/";
 	  sharedWorkspace =
 		(NSWorkspace*)NSAllocateObject(self, 0, NSDefaultMallocZone());
 
-	  [NSNotificationCenter addObserver: sharedWorkspace
-				   selector: @selector(noteUserDefaultsChanged)
-				       name: NSUserDefaultsDidChangeNotification
-				     object: nil];
+	  [[NSNotificationCenter defaultCenter]
+	    addObserver: sharedWorkspace
+	       selector: @selector(noteUserDefaultsChanged)
+		   name: NSUserDefaultsDidChangeNotification
+		 object: nil];
 	}
       [gnustep_global_lock unlock];
     }
diff --git a/Tools/gpbs.m b/Tools/gpbs.m
index bc2289a87..97a973036 100644
--- a/Tools/gpbs.m
+++ b/Tools/gpbs.m
@@ -856,10 +856,11 @@ NSMutableDictionary	*pasteboards = nil;
 
 - (NSConnection*) connection: ancestor didConnect: newConn
 {
-  [NotificationDispatcher addObserver: self
-			     selector: @selector(connectionBecameInvalid:)
-				 name: NSConnectionDidDieNotification
-			       object: newConn];
+  [[NSNotificationCenter defaultCenter]
+    addObserver: self
+       selector: @selector(connectionBecameInvalid:)
+	   name: NSConnectionDidDieNotification
+	 object: newConn];
   [newConn setDelegate: self];
   return newConn;
 }
@@ -1055,10 +1056,11 @@ main(int argc, char** argv)
     }
 
   [conn setDelegate:server];
-  [NotificationDispatcher addObserver: server
-		 selector: @selector(connectionBecameInvalid:)
-		 name: NSConnectionDidDieNotification
-		   object: conn];
+  [[NSNotificationCenter defaultCenter]
+    addObserver: server
+       selector: @selector(connectionBecameInvalid:)
+	   name: NSConnectionDidDieNotification
+	 object: conn];
 
   if (verbose)
     {