diff --git a/ChangeLog b/ChangeLog
index bba852c74..a01d406e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,11 @@
-2002-04-17  Richard Frith-Macdonald <rfm@gnu.org>
+2002-04-18  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Tools/gdomap.c: re-order headers so config.h is used on windoze
 	* Source/NSFileManager.m: ([-fileSystemRepresentationWithPath:])
 	modified to handle MSYS paths with '/drive/' prefix.
+	* Source/GSTcpPort.m: ([-invalidate]) call superclass implementation
+	at start, so flag gets set to say we are not valid, and we avoid any
+	recursive calls.
 
 2002-04-16  Richard Frith-Macdonald <rfm@gnu.org>
 
diff --git a/Source/GSTcpPort.m b/Source/GSTcpPort.m
index 9e9559122..be938950e 100644
--- a/Source/GSTcpPort.m
+++ b/Source/GSTcpPort.m
@@ -1769,6 +1769,8 @@ static Class		tcpPortClass;
       NSArray		*handleArray;
       unsigned		i;
 
+      [super invalidate];	// Avoid recursive calls
+
       [tcpPortLock lock];
       thePorts = NSMapGet(tcpPortMap, (void*)(gsaddr)portNum);
       if (thePorts != 0)
@@ -1795,7 +1797,6 @@ static Class		tcpPortClass;
 	  NSFreeMapTable(handles);
 	  handles = 0;
 	}
-      [super invalidate];
     }
   DO_UNLOCK(myLock);
 }