diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff
index 07e5c1bd8d2..0ba3a5bc0af 100644
--- a/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@ -343,6 +343,7 @@ dll\win32\wldap32\wldap32.dll                       1
 dll\win32\ws2_32\ws2_32.dll                         1
 dll\win32\ws2help\ws2help.dll                       1
 dll\win32\wshirda\wshirda.dll                       1
+dll\win32\wshtcpip\wshtcpip.dll                     1
 dll\win32\wsock32\wsock32.dll                       1
 dll\win32\wtsapi32\wtsapi32.dll                     1
 dll\win32\winmm\midimap\midimap.dll                 1
@@ -375,7 +376,6 @@ drivers\network\afd\afd.sys                         2
 drivers\network\ndis\ndis.sys                       2
 drivers\network\tcpip\tcpip.sys                     2
 drivers\network\tdi\tdi.sys                         2
-drivers\network\wshtcpip\wshtcpip.dll               1
 drivers\network\dd\ne2000\ne2000.sys                2
 drivers\network\dd\pcnet\pcnet.sys                  2
 
diff --git a/reactos/dll/win32/win32.rbuild b/reactos/dll/win32/win32.rbuild
index 395de4dd5a1..06d3d27866c 100644
--- a/reactos/dll/win32/win32.rbuild
+++ b/reactos/dll/win32/win32.rbuild
@@ -388,6 +388,9 @@
 <directory name="wshirda">
 	<xi:include href="wshirda/wshirda.rbuild" />
 </directory>
+<directory name="wshtcpip">
+	<xi:include href="wshtcpip/wshtcpip.rbuild" />
+</directory>
 <directory name="wsock32">
 	<xi:include href="wsock32/wsock32.rbuild" />
 </directory>
diff --git a/reactos/drivers/network/wshtcpip/wshtcpip.c b/reactos/dll/win32/wshtcpip/wshtcpip.c
similarity index 100%
rename from reactos/drivers/network/wshtcpip/wshtcpip.c
rename to reactos/dll/win32/wshtcpip/wshtcpip.c
diff --git a/reactos/drivers/network/wshtcpip/wshtcpip.def b/reactos/dll/win32/wshtcpip/wshtcpip.def
similarity index 100%
rename from reactos/drivers/network/wshtcpip/wshtcpip.def
rename to reactos/dll/win32/wshtcpip/wshtcpip.def
diff --git a/reactos/drivers/network/wshtcpip/wshtcpip.h b/reactos/dll/win32/wshtcpip/wshtcpip.h
similarity index 100%
rename from reactos/drivers/network/wshtcpip/wshtcpip.h
rename to reactos/dll/win32/wshtcpip/wshtcpip.h
diff --git a/reactos/drivers/network/wshtcpip/wshtcpip.rbuild b/reactos/dll/win32/wshtcpip/wshtcpip.rbuild
similarity index 100%
rename from reactos/drivers/network/wshtcpip/wshtcpip.rbuild
rename to reactos/dll/win32/wshtcpip/wshtcpip.rbuild
diff --git a/reactos/drivers/network/wshtcpip/wshtcpip.rc b/reactos/dll/win32/wshtcpip/wshtcpip.rc
similarity index 100%
rename from reactos/drivers/network/wshtcpip/wshtcpip.rc
rename to reactos/dll/win32/wshtcpip/wshtcpip.rc
diff --git a/reactos/drivers/network/wshtcpip/wshtcpip_specs b/reactos/dll/win32/wshtcpip/wshtcpip_specs
similarity index 100%
rename from reactos/drivers/network/wshtcpip/wshtcpip_specs
rename to reactos/dll/win32/wshtcpip/wshtcpip_specs
diff --git a/reactos/drivers/network/directory.rbuild b/reactos/drivers/network/directory.rbuild
index 99766fa418f..2a62dbd7fbf 100644
--- a/reactos/drivers/network/directory.rbuild
+++ b/reactos/drivers/network/directory.rbuild
@@ -16,7 +16,4 @@
 <directory name="tdi">
 	<xi:include href="tdi/tdi.rbuild" />
 </directory>
-<directory name="wshtcpip">
-	<xi:include href="wshtcpip/wshtcpip.rbuild" />
-</directory>
 </group>