Index: sdk/lib/drivers/ip/transport/tcp/tcp.c
===================================================================
--- sdk/lib/drivers/ip/transport/tcp/tcp.c	(revision 73089)
+++ sdk/lib/drivers/ip/transport/tcp/tcp.c	(working copy)
@@ -337,6 +337,12 @@
     
     if (NT_SUCCESS(Status))
     {
+        /* Check if we had an unspecified address */
+        if (Connection->AddressFile->Address.Address.IPv4Address != bindaddr.addr)
+        {
+            /* We did, so we need to copy back the address */
+            Connection->AddressFile->Address.Address.IPv4Address = bindaddr.addr;
+        }
         /* Check if we had an unspecified port */
         if (!Connection->AddressFile->Port)
         {