diff --git a/ChangeLog b/ChangeLog
index 87975fdc5..41e4227cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-22  Wolfgang Lux  <wolgang.lux@gmail.com>
+
+	* Source/NSSocketPort.m	(+portNumber:onHost:forceAddress:listener):
+	Fix an uninitialized variable bug, which could lead to returning
+	ports with an incorrect port number.
+
 2011-12-19 Riccardo Mottola <rm@gnu.org>
 
 	* Source/GSString.m:
diff --git a/Source/NSSocketPort.m b/Source/NSSocketPort.m
index df48b162f..e32392142 100644
--- a/Source/NSSocketPort.m
+++ b/Source/NSSocketPort.m
@@ -1595,7 +1595,13 @@ static Class		tcpPortClass;
 	   * listener socket to accept incoming connections.
 	   */
 	  addrOk = GSPrivateSockaddrSetup(addr, number, nil, nil, &sockaddr);
-	  if (NO == addrOk)
+
+	  /*
+	   * Need size of buffer for getsockbyname() later.
+	   */
+	  slen = sizeof(sockaddr);
+
+	  if (addrOk == NO)
 	    {
 	      NSLog(@"Bad address (%@) specified for listening port", addr);
 	      DESTROY(port);