diff --git a/drivers/network/tcpip/include/titypes.h b/drivers/network/tcpip/include/titypes.h
index 8d0f4282604..5ca137bf89a 100644
--- a/drivers/network/tcpip/include/titypes.h
+++ b/drivers/network/tcpip/include/titypes.h
@@ -154,6 +154,7 @@ typedef struct _ADDRESS_FILE {
     /* Associated listener (see transport/tcp/accept.c) */
     IP_ADDRESS AddrCache;                 /* One entry address cache (destination
                                              address of last packet transmitted) */
+    HANDLE ProcessId;                     /* Creator process ID */
 
     /* The following members are used to control event notification */
 
diff --git a/drivers/network/tcpip/tcpip/fileobjs.c b/drivers/network/tcpip/tcpip/fileobjs.c
index 313e9d1ee66..c637150158b 100644
--- a/drivers/network/tcpip/tcpip/fileobjs.c
+++ b/drivers/network/tcpip/tcpip/fileobjs.c
@@ -424,6 +424,7 @@ NTSTATUS FileOpenAddress(
   AddrFile->DF = 0;
   AddrFile->BCast = 1;
   AddrFile->HeaderIncl = 1;
+  AddrFile->ProcessId = PsGetCurrentProcessId();
 
   /* Make sure address is a local unicast address or 0 */
   /* FIXME: IPv4 only */