diff --git a/ChangeLog b/ChangeLog
index b710da962..a9c75531c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-07  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/GSTcpPort.m: set size for return buffer of getsockbyname()
+
 2000-07-07  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSRunLoop.m: Minor optimisation in select(), also update
diff --git a/Source/GSTcpPort.m b/Source/GSTcpPort.m
index ee96c228c..977baa8aa 100644
--- a/Source/GSTcpPort.m
+++ b/Source/GSTcpPort.m
@@ -1138,6 +1138,11 @@ static Class		tcpPortClass;
 		}
 	    }
 
+	  /*
+           * Need size of buffer for getsockbyname() later.
+	   */
+	  i = sizeof(sockaddr);
+
 	  if (addrOk == NO)
 	    {
 	      NSLog(@"Bad address (%@) specified for listening port", addr);
diff --git a/Testing/client.m b/Testing/client.m
index ce2d4a344..497c4c8aa 100644
--- a/Testing/client.m
+++ b/Testing/client.m
@@ -205,7 +205,12 @@ printf("oneway %d\n", _F_ONEWAY);
 
   {
     NSDate	*d = [NSDate date];
+    NSData	*sen = [NSMutableData data];
+    id		rep;
 
+    [sen setLength: 100000];
+    rep = [p echoObject: sen];
+    NSLog(@"Send: 0x%x, Reply: 0x%x, Length: %d", sen, rep, [rep length]);
     [NSConnection setDebug: 0];
     [NSDistantObject setDebug: 0];
     [NSPort setDebug: 0];