diff --git a/ChangeLog b/ChangeLog
index c69927c52..3899663c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,13 @@
+2002-04-19  Richard Frith-Macdonald <rfm@gnu.org>
+
+        * Tools/gpbs.m: If given -NSHost specification for the current host,
+        ignore it and use the standard name.
+
 2002-04-18  Ludovic Marcotte <ludovic@Sophos.ca>
 
 	* Source/NSOutlineView.m and Headers/gnustep/gui/NSOutlineView.h:
 	Fixed some issues with the delegate methods. 
 
-
 Thu Apr 18 11:14:22 2002  Nicola Pero  <n.pero@mi.flashnet.it>
 
 	* Headers/gnustep/gui/AppKitDefines.h (APPKIT_DECLARE): Updated
diff --git a/Tools/gpbs.m b/Tools/gpbs.m
index b4b1fb2dd..f40915935 100644
--- a/Tools/gpbs.m
+++ b/Tools/gpbs.m
@@ -1130,7 +1130,8 @@ main(int argc, char** argv, char **env)
 	 object: (id)conn];
 
   hostname = [[NSUserDefaults standardUserDefaults] stringForKey: @"NSHost"];
-  if ([hostname length] == 0)
+  if ([hostname length] == 0
+    ||  [[NSHost hostWithName: hostname] isEqual: [NSHost currentHost]] == YES)
     {
       if ([conn registerName: PBSNAME] == NO)
         {