diff --git a/ChangeLog b/ChangeLog
index cbb5e1e29..238ba7c81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Oct 23 17:45:00 2003  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSSocketPort.m:
+	([portWithNumber:onHost:forceAddress:listener:]) minor fix for bug
+	reported by Bjorn Giesler ... was ignoring requested listening port.
+
 2003-10-22  David Ayers  <d.ayers@inode.at>
 
 	* Source/NSConcreteNumber.h: Moved here from
diff --git a/Source/NSSocketPort.m b/Source/NSSocketPort.m
index 7755f51a0..0abaf84e9 100644
--- a/Source/NSSocketPort.m
+++ b/Source/NSSocketPort.m
@@ -277,9 +277,9 @@ decodePort(NSData *data, NSString *defaultAddress)
     }
 
   return [NSSocketPort portWithNumber: pnum
-			    onHost: host
-		      forceAddress: nil
-			  listener: NO];
+			       onHost: host
+			 forceAddress: nil
+			     listener: NO];
 }
 
 static NSData*
@@ -1381,9 +1381,9 @@ static unsigned	wordAlign;
  * remote host, the port will use the first address that works.
  */
 + (NSSocketPort*) portWithNumber: (gsu16)number
-		       onHost: (NSHost*)aHost
-		 forceAddress: (NSString*)addr
-		     listener: (BOOL)shouldListen
+			  onHost: (NSHost*)aHost
+		    forceAddress: (NSString*)addr
+			listener: (BOOL)shouldListen
 {
   unsigned		i;
   NSSocketPort		*port = nil;
@@ -1466,6 +1466,7 @@ static unsigned	wordAlign;
 		  addrOk = NO;
 		}
 	    }
+	  sockaddr.sin_port = GSSwapHostI16ToBig(number);
 
 	  /*
            * Need size of buffer for getsockbyname() later.