diff --git a/reactos/base/services/CMakeLists.txt b/reactos/base/services/CMakeLists.txt
index e909cfa9c2e..93180719a98 100644
--- a/reactos/base/services/CMakeLists.txt
+++ b/reactos/base/services/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 add_subdirectory(audiosrv)
+add_subdirectory(dhcpcsvc)
 add_subdirectory(eventlog)
 add_subdirectory(rpcss)
 add_subdirectory(schedsvc)
diff --git a/reactos/dll/win32/dhcpcsvc/CMakeLists.txt b/reactos/base/services/dhcpcsvc/CMakeLists.txt
similarity index 100%
rename from reactos/dll/win32/dhcpcsvc/CMakeLists.txt
rename to reactos/base/services/dhcpcsvc/CMakeLists.txt
diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c b/reactos/base/services/dhcpcsvc/dhcp/adapter.c
similarity index 100%
rename from reactos/dll/win32/dhcpcsvc/dhcp/adapter.c
rename to reactos/base/services/dhcpcsvc/dhcp/adapter.c
diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/alloc.c b/reactos/base/services/dhcpcsvc/dhcp/alloc.c
similarity index 100%
rename from reactos/dll/win32/dhcpcsvc/dhcp/alloc.c
rename to reactos/base/services/dhcpcsvc/dhcp/alloc.c
diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/api.c b/reactos/base/services/dhcpcsvc/dhcp/api.c
similarity index 100%
rename from reactos/dll/win32/dhcpcsvc/dhcp/api.c
rename to reactos/base/services/dhcpcsvc/dhcp/api.c
diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/compat.c b/reactos/base/services/dhcpcsvc/dhcp/compat.c
similarity index 100%
rename from reactos/dll/win32/dhcpcsvc/dhcp/compat.c
rename to reactos/base/services/dhcpcsvc/dhcp/compat.c
diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c b/reactos/base/services/dhcpcsvc/dhcp/dhclient.c
similarity index 100%
rename from reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c
rename to reactos/base/services/dhcpcsvc/dhcp/dhclient.c
diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/dispatch.c b/reactos/base/services/dhcpcsvc/dhcp/dispatch.c
similarity index 100%
rename from reactos/dll/win32/dhcpcsvc/dhcp/dispatch.c
rename to reactos/base/services/dhcpcsvc/dhcp/dispatch.c
diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/hash.c b/reactos/base/services/dhcpcsvc/dhcp/hash.c
similarity index 100%
rename from reactos/dll/win32/dhcpcsvc/dhcp/hash.c
rename to reactos/base/services/dhcpcsvc/dhcp/hash.c
diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/options.c b/reactos/base/services/dhcpcsvc/dhcp/options.c
similarity index 100%
rename from reactos/dll/win32/dhcpcsvc/dhcp/options.c
rename to reactos/base/services/dhcpcsvc/dhcp/options.c
diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/pipe.c b/reactos/base/services/dhcpcsvc/dhcp/pipe.c
similarity index 100%
rename from reactos/dll/win32/dhcpcsvc/dhcp/pipe.c
rename to reactos/base/services/dhcpcsvc/dhcp/pipe.c
diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/socket.c b/reactos/base/services/dhcpcsvc/dhcp/socket.c
similarity index 100%
rename from reactos/dll/win32/dhcpcsvc/dhcp/socket.c
rename to reactos/base/services/dhcpcsvc/dhcp/socket.c
diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/tables.c b/reactos/base/services/dhcpcsvc/dhcp/tables.c
similarity index 100%
rename from reactos/dll/win32/dhcpcsvc/dhcp/tables.c
rename to reactos/base/services/dhcpcsvc/dhcp/tables.c
diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/tree.c b/reactos/base/services/dhcpcsvc/dhcp/tree.c
similarity index 100%
rename from reactos/dll/win32/dhcpcsvc/dhcp/tree.c
rename to reactos/base/services/dhcpcsvc/dhcp/tree.c
diff --git a/reactos/dll/win32/dhcpcsvc/dhcp/util.c b/reactos/base/services/dhcpcsvc/dhcp/util.c
similarity index 100%
rename from reactos/dll/win32/dhcpcsvc/dhcp/util.c
rename to reactos/base/services/dhcpcsvc/dhcp/util.c
diff --git a/reactos/dll/win32/dhcpcsvc/dhcpcsvc.c b/reactos/base/services/dhcpcsvc/dhcpcsvc.c
similarity index 100%
rename from reactos/dll/win32/dhcpcsvc/dhcpcsvc.c
rename to reactos/base/services/dhcpcsvc/dhcpcsvc.c
diff --git a/reactos/dll/win32/dhcpcsvc/dhcpcsvc.rc b/reactos/base/services/dhcpcsvc/dhcpcsvc.rc
similarity index 100%
rename from reactos/dll/win32/dhcpcsvc/dhcpcsvc.rc
rename to reactos/base/services/dhcpcsvc/dhcpcsvc.rc
diff --git a/reactos/dll/win32/dhcpcsvc/dhcpcsvc.spec b/reactos/base/services/dhcpcsvc/dhcpcsvc.spec
similarity index 100%
rename from reactos/dll/win32/dhcpcsvc/dhcpcsvc.spec
rename to reactos/base/services/dhcpcsvc/dhcpcsvc.spec
diff --git a/reactos/dll/win32/dhcpcsvc/include/debug.h b/reactos/base/services/dhcpcsvc/include/debug.h
similarity index 100%
rename from reactos/dll/win32/dhcpcsvc/include/debug.h
rename to reactos/base/services/dhcpcsvc/include/debug.h
diff --git a/reactos/dll/win32/dhcpcsvc/include/dhcp.h b/reactos/base/services/dhcpcsvc/include/dhcp.h
similarity index 100%
rename from reactos/dll/win32/dhcpcsvc/include/dhcp.h
rename to reactos/base/services/dhcpcsvc/include/dhcp.h
diff --git a/reactos/dll/win32/dhcpcsvc/include/dhcpd.h b/reactos/base/services/dhcpcsvc/include/dhcpd.h
similarity index 100%
rename from reactos/dll/win32/dhcpcsvc/include/dhcpd.h
rename to reactos/base/services/dhcpcsvc/include/dhcpd.h
diff --git a/reactos/dll/win32/dhcpcsvc/include/hash.h b/reactos/base/services/dhcpcsvc/include/hash.h
similarity index 100%
rename from reactos/dll/win32/dhcpcsvc/include/hash.h
rename to reactos/base/services/dhcpcsvc/include/hash.h
diff --git a/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h b/reactos/base/services/dhcpcsvc/include/rosdhcp.h
similarity index 100%
rename from reactos/dll/win32/dhcpcsvc/include/rosdhcp.h
rename to reactos/base/services/dhcpcsvc/include/rosdhcp.h
diff --git a/reactos/dll/win32/dhcpcsvc/include/tree.h b/reactos/base/services/dhcpcsvc/include/tree.h
similarity index 100%
rename from reactos/dll/win32/dhcpcsvc/include/tree.h
rename to reactos/base/services/dhcpcsvc/include/tree.h
diff --git a/reactos/dll/win32/CMakeLists.txt b/reactos/dll/win32/CMakeLists.txt
index 4806fda3d3b..6afeb6026b3 100644
--- a/reactos/dll/win32/CMakeLists.txt
+++ b/reactos/dll/win32/CMakeLists.txt
@@ -36,7 +36,6 @@ add_subdirectory(cryptui)
 add_subdirectory(dbghelp)
 add_subdirectory(dciman32)
 add_subdirectory(devmgr)
-add_subdirectory(dhcpcsvc)
 add_subdirectory(dnsapi)
 add_subdirectory(esent)
 add_subdirectory(faultrep)