Index: boot/bootdata/hivesys.inf
===================================================================
--- boot/bootdata/hivesys.inf	(revision 72853)
+++ boot/bootdata/hivesys.inf	(working copy)
@@ -1471,17 +1471,6 @@
 HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Start",0x00010001,0x00000004
 HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Type",0x00010001,0x00000001
 
-; DHCP client service
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","DisplayName",0x00000000,"DHCP Client"
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Description",0x00000000,"Attempts to obtain network settings automatically from an available DHCP server"
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","ErrorControl",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Group",0x00000000,"TDI"
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe -k netsvcs"
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","ObjectName",0x00000000,"LocalSystem"
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Start",0x00010001,0x00000002
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Type",0x00010001,0x00000020
-HKLM,"SYSTEM\CurrentControlSet\Services\DHCP\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\dhcpcsvc.dll"
-
 ; EMS Serial Administration Console Driver
 HKLM,"SYSTEM\CurrentControlSet\Services\sacdrv","ErrorControl",0x00010001,0x00000000
 HKLM,"SYSTEM\CurrentControlSet\Services\sacdrv","Group",0x00000000,"EMS"
Index: dll/win32/syssetup/install.c
===================================================================
--- dll/win32/syssetup/install.c	(revision 72853)
+++ dll/win32/syssetup/install.c	(working copy)
@@ -834,6 +834,7 @@
     {
         /* Start the TCP/IP protocol driver */
         SetupStartService(L"Tcpip", FALSE);
+        SetupStartService(L"Dhcp", FALSE);
     }
 
     if (!CommonInstall())
@@ -1148,6 +1149,7 @@
     {
         /* Start the TCP/IP protocol driver */
         SetupStartService(L"Tcpip", FALSE);
+        SetupStartService(L"Dhcp", FALSE);
     }
 
 
Index: media/inf/nettcpip.inf
===================================================================
--- media/inf/nettcpip.inf	(revision 72853)
+++ media/inf/nettcpip.inf	(working copy)
@@ -234,6 +234,7 @@
 
 [MS_TCPIP.PrimaryInstall.Services]
 AddService = Tcpip, , tcpip_Service_Inst
+AddService = DHCP, , dhcp_Service_Inst
 
 [tcpip_Service_Inst]
 ServiceType   = 1
@@ -254,6 +255,20 @@
 HKR,"Parameters","EnableSecurityFilters",0x00010001,0x00000000
 ;HKR,"Parameters","PersistentRoutes",,0x00000010
 
+[dhcp_Service_Inst]
+DisplayName   = "DHCP Client"
+Description   = "Attempts to obtain network settings automatically from an available DHCP server"
+ServiceType   = 0x20
+StartType     = 2
+ErrorControl  = 1
+ServiceBinary = "%11%\svchost.exe -k netsvcs"
+LoadOrderGroup = TDI
+AddReg=dhcp_AddReg
+
+[dhcp_AddReg]
+HKR,"ObjectName",0x00000000,"LocalSystem"
+HKR,"Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\dhcpcsvc.dll"
+
 ;-------------------------------- STRINGS -------------------------------
 
 [Strings]