diff --git a/reactos/CMakeLists.txt b/reactos/CMakeLists.txt
index 956b22ffa72..661c5389d68 100644
--- a/reactos/CMakeLists.txt
+++ b/reactos/CMakeLists.txt
@@ -244,6 +244,9 @@ else()
     add_subdirectory(tools/wpp)
     add_subdirectory(win32ss)
 
+    # Create the registry hives
+    create_registry_hives()
+
     # Create {bootcd, livecd, bootcdregtest}.lst
     create_iso_lists()
 
diff --git a/reactos/boot/bootdata/CMakeLists.txt b/reactos/boot/bootdata/CMakeLists.txt
index 9346f8d8554..96ffe5923b7 100644
--- a/reactos/boot/bootdata/CMakeLists.txt
+++ b/reactos/boot/bootdata/CMakeLists.txt
@@ -5,59 +5,12 @@ add_subdirectory(packages)
 
 add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/txtsetup.sif DESTINATION reactos NO_CAB FOR bootcd regtest)
 
-list(APPEND _common_hives
-    ${CMAKE_CURRENT_SOURCE_DIR}/hivecls.inf
-    ${CMAKE_CURRENT_SOURCE_DIR}/hivedef.inf
-    ${CMAKE_CURRENT_SOURCE_DIR}/hivesft.inf
-    ${CMAKE_CURRENT_SOURCE_DIR}/hivesys.inf)
+add_registry_inf(
+    hivecls.inf
+    hivedef.inf
+    hivesft.inf
+    hivesys.inf)
 
-foreach(_hive ${_common_hives})
-    get_filename_component(_hive_name ${_hive} NAME)
-    set(_converted_hive ${CMAKE_CURRENT_BINARY_DIR}/${_hive_name})
-    add_custom_command(OUTPUT ${_converted_hive}
-                       COMMAND native-utf16le ${_hive} ${_converted_hive}
-                       DEPENDS native-utf16le ${_hive})
-    list(APPEND _converted_common_hives ${_converted_hive})
-endforeach()
-
-add_custom_target(converted_hives DEPENDS ${_converted_common_hives})
-add_cd_file(TARGET converted_hives
-            FILE ${_converted_common_hives}
-            DESTINATION reactos
-            NO_CAB
-            FOR bootcd regtest)
-
-# livecd hives
-list(APPEND _livecd_hives
-    ${_converted_common_hives}
-    ${CMAKE_CURRENT_SOURCE_DIR}/livecd.inf
-    ${CMAKE_CURRENT_SOURCE_DIR}/hiveinst.inf)
-
-add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sam
-        ${CMAKE_CURRENT_BINARY_DIR}/default
-        ${CMAKE_CURRENT_BINARY_DIR}/security
-        ${CMAKE_CURRENT_BINARY_DIR}/software
-        ${CMAKE_CURRENT_BINARY_DIR}/system
-    COMMAND native-mkhive ${CMAKE_CURRENT_BINARY_DIR} ${_livecd_hives}
-    DEPENDS native-mkhive ${_livecd_hives} ${_converted_common_hives})
-
-add_custom_target(livecd_hives
-    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/sam
-        ${CMAKE_CURRENT_BINARY_DIR}/default
-        ${CMAKE_CURRENT_BINARY_DIR}/security
-        ${CMAKE_CURRENT_BINARY_DIR}/software
-        ${CMAKE_CURRENT_BINARY_DIR}/system)
-
-add_cd_file(
-    FILE ${CMAKE_CURRENT_BINARY_DIR}/sam
-        ${CMAKE_CURRENT_BINARY_DIR}/default
-        ${CMAKE_CURRENT_BINARY_DIR}/security
-        ${CMAKE_CURRENT_BINARY_DIR}/software
-        ${CMAKE_CURRENT_BINARY_DIR}/system
-    TARGET livecd_hives
-    DESTINATION reactos/system32/config
-    FOR livecd)
 
 #regtest
 add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcdregtest/regtest.cmd DESTINATION reactos/bin FOR all)
diff --git a/reactos/boot/bootdata/hivesys.inf b/reactos/boot/bootdata/hivesys.inf
index e87e229699e..ccdcd75757a 100644
--- a/reactos/boot/bootdata/hivesys.inf
+++ b/reactos/boot/bootdata/hivesys.inf
@@ -1348,22 +1348,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\swenum","ImagePath",0x00020000,"system32
 HKLM,"SYSTEM\CurrentControlSet\Services\swenum","Start",0x00010001,0x00000000
 HKLM,"SYSTEM\CurrentControlSet\Services\swenum","Type",0x00010001,0x00000001
 
-
-; Afd driver
-HKLM,"SYSTEM\CurrentControlSet\Services\Afd","ErrorControl",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Group",0x00000000,"TDI"
-HKLM,"SYSTEM\CurrentControlSet\Services\Afd","ImagePath",0x00020000,"system32\drivers\afd.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Start",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Type",0x00010001,0x00000001
-
-; UniATA/Atapi miniport driver
-HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ErrorControl",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Group",0x00000000,"System Bus Extender"
-HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ImagePath",0x00020000,"system32\drivers\uniata.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Start",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Type",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Tag",0x00010001,0x00000010
-
 ; Audio Service
 HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","DisplayName",0x00000000,"Audio Service"
 HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Description",0x00000000,"Provides audio facilities to applications"
@@ -1374,21 +1358,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","ObjectName",0x00000000,"Lo
 HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Start",0x00010001,0x00000003
 HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","Type",0x00010001,0x00000010
 
-; BusLogic 958 miniport driver
-HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","ErrorControl",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Group",0x00000000,"SCSI Miniport"
-HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","ImagePath",0x00020000,"system32\drivers\buslogic.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Start",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Type",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Tag",0x00010001,0x00000020
-
-; Beep device driver
-HKLM,"SYSTEM\CurrentControlSet\Services\Beep","ErrorControl",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Group",0x00000000,"Base"
-HKLM,"SYSTEM\CurrentControlSet\Services\Beep","ImagePath",0x00020000,"system32\drivers\beep.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Start",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Type",0x00010001,0x00000001
-
 ; Background Intelligent Transfer Service (BITS)
 HKLM,"SYSTEM\CurrentControlSet\Services\BITS","DisplayName",0x00000000,"BITS"
 HKLM,"SYSTEM\CurrentControlSet\Services\BITS","Description",0x00000000,"Background Intelligent Transfer Service (BITS)"
@@ -1406,20 +1375,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Blue","ImagePath",0x00020000,"system32\d
 HKLM,"SYSTEM\CurrentControlSet\Services\Blue","Start",0x00010001,0x00000001
 HKLM,"SYSTEM\CurrentControlSet\Services\Blue","Type",0x00010001,0x00000001
 
-; Cdfs (ISO96660) filesystem driver
-HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ErrorControl",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Group",0x00000000,"File System"
-HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ImagePath",0x00020000,"system32\drivers\cdfs.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Start",0x00010001,0x00000003
-HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Type",0x00010001,0x00000002
-
-; Cdrom class driver
-HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","ErrorControl",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Group",0x00000000,"SCSI Class"
-HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","ImagePath",0x00020000,"system32\drivers\cdrom.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Start",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Type",0x00010001,0x00000001
-
 ; Debug output driver
 HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","ErrorControl",0x00010001,0x00000000
 HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Group",0x00000000,"Debug"
@@ -1427,13 +1382,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","ImagePath",0x00020000,"system
 HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Start",0x00010001,0x00000004
 HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Type",0x00010001,0x00000001
 
-; Disk class driver
-HKLM,"SYSTEM\CurrentControlSet\Services\Disk","ErrorControl",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Group",0x00000000,"SCSI Class"
-HKLM,"SYSTEM\CurrentControlSet\Services\Disk","ImagePath",0x00020000,"system32\drivers\disk.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Start",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\Disk","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"
@@ -1482,13 +1430,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\EventLog","TypesSupporte
 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\Service Control Manager","EventMessageFile",0x00020000,"%SystemRoot%\system32\netevent.dll"
 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System\Service Control Manager","TypesSupported",0x00010001,0x00000007
 
-; Floppy driver
-HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","ErrorControl",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Group",0x00000000,"Primary Disk"
-HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","ImagePath",0x00020000,"system32\drivers\floppy.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Start",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Type",0x00010001,0x00000001
-
 ; Filesystem recognizer driver
 HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","ErrorControl",0x00010001,0x00000000
 HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Group",0x00000000,"Boot file system"
@@ -1496,22 +1437,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","ImagePath",0x00020000,"system32
 HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Start",0x00010001,0x00000001
 HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Type",0x00010001,0x00000008
 
-; Keyboard class driver
-HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ErrorControl",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Group",0x00000000,"Keyboard Class"
-HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ImagePath",0x00020000,"system32\drivers\kbdclass.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Start",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Type",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass\Parameters","ConnectMultiplePorts",0x00010001,1
-HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08002BE10318}","UpperFilters",0x00010000,"kbdclass"
-
-; Kernel Security Support Provider Interface Driver
-HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","ErrorControl",0x00010001,0x00000003
-HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","Group",0x00000000,"Base"
-HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","ImagePath",0x00020000,"system32\drivers\ksecdd.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","Start",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","Type",0x00010001,0x00000001
-
 ; Workstation service
 HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation","DisplayName",0x00000000,"Workstation service"
 HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation","ErrorControl",0x00010001,0x00000001
@@ -1530,22 +1455,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","Start",0x00010001,0x00000004
 HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","ErrorControl",0x00010001,0x00000001
 HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","ImagePath",0x00020000,"system32\drivers\mpu401.sys"
 
-; Mouse class driver
-HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","ErrorControl",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Group",0x00000000,"Pointer Class"
-HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","ImagePath",0x00020000,"system32\drivers\mouclass.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Start",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Type",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\mouclass\Parameters","ConnectMultiplePorts",0x00010001,1
-HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96F-E325-11CE-BFC1-08002BE10318}","UpperFilters",0x00010000,"mouclass"
-
-; Mailslot filesystem driver
-HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","ErrorControl",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","Group",0x00000000,"File System"
-HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","ImagePath",0x00020000,"system32\drivers\msfs.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","Start",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","Type",0x00010001,0x00000002
-
 ; Multiple UNC provider driver
 ;HKLM,"SYSTEM\CurrentControlSet\Services\Mup","Description",0x00000000,"Multiple UNC Provider (MUP)"
 ;HKLM,"SYSTEM\CurrentControlSet\Services\Mup","ErrorControl",0x00010001,0x00000001
@@ -1570,13 +1479,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","Type",0x00010001,0x00000001
 ;HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","Start",0x00010001,0x00000003
 ;HKLM,"SYSTEM\CurrentControlSet\Services\Netlogon","Type",0x00010001,0x00000020
 
-; Named Pipe filesystem driver
-HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","ErrorControl",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","Group",0x00000000,"File System"
-HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","ImagePath",0x00020000,"system32\drivers\npfs.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","Start",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","Type",0x00010001,0x00000002
-
 ; NTFS filesystem driver
 HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","ErrorControl",0x00010001,0x00000000
 HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Group",0x00000000,"File System"
@@ -2020,48 +1922,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ImagePath",0x00020000,"system32
 HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Start",0x00010001,0x00000003
 HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Type",0x00010001,0x00000002
 
-; VBE SVGA driver
-HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ErrorControl",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Group",0x00000000,"Video Save"
-HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ImagePath",0x00020000,"system32\drivers\vbemp.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Start",0x00010001,0x00000004
-HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Type",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Tag",0x00010001,0x00000001
-
-HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","InstalledDisplayDrivers",0x00010000,"framebuf"
-HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.VRefresh",0x00010001,1
-HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.BitsPerPel",0x00010001,8
-HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XResolution",0x00010001,640
-HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YResolution",0x00010001,480
-HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.FixedOutput",0x00010001,0
-HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.Flags",0x00010001,0
-HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.Orientation",0x00010001,0
-HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XPanning",0x00010001,0
-HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YPanning",0x00010001,0
-HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.RelativeX",0x00010001,0
-HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.RelativeY",0x00010001,0
-HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.ToDesktop",0x00010001,1
-HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.PrimaryDevice",0x00010001,1
-HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Device Description",0x00020000,"Generic VESA Adapter"
-
-; This is not true but it allows to use 3rd party drivers while having the VBE driver installed
-HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","VgaCompatible",0x00010001,1
-
-; VGA miniport driver
-HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ErrorControl",0x00010001,0x00000000
-HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Group",0x00000000,"Video Save"
-HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ImagePath",0x00020000,"system32\drivers\vgamp.sys"
-HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Start",0x00010001,0x00000004
-HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Type",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Tag",0x00010001,0x00000002
-HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","VgaCompatible",0x00010001,1
-
-HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","InstalledDisplayDrivers",0x00010000,"vgaddi"
-HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.VRefresh",0x00010001,1
-HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.BitsPerPel",0x00010001,8
-HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.XResolution",0x00010001,640
-HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.YResolution",0x00010001,480
-
 ; ControlSet selection settings
 HKLM,"SYSTEM\Select","Current",0x00010001,0x00000001
 HKLM,"SYSTEM\Select","Default",0x00010001,0x00000001
diff --git a/reactos/boot/bootdata/txtsetup.sif b/reactos/boot/bootdata/txtsetup.sif
index 134c7dbc373..8c475f1483b 100644
--- a/reactos/boot/bootdata/txtsetup.sif
+++ b/reactos/boot/bootdata/txtsetup.sif
@@ -519,9 +519,6 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)"
 00000455 = kbdbur.dll
 
 [HiveInfs.Install]
-AddReg=hivecls.inf,AddReg
-AddReg=hivedef.inf,AddReg
-AddReg=hivesft.inf,AddReg
-AddReg=hivesys.inf,AddReg
+AddReg=registry.inf,AddReg
 
 ; EOF
diff --git a/reactos/boot/freeldr/freeldr/CMakeLists.txt b/reactos/boot/freeldr/freeldr/CMakeLists.txt
index 450a58af6be..1ea2aafeec7 100644
--- a/reactos/boot/freeldr/freeldr/CMakeLists.txt
+++ b/reactos/boot/freeldr/freeldr/CMakeLists.txt
@@ -226,13 +226,10 @@ endif()
 add_dependencies(freeldr_pe asm)
 add_dependencies(freeldr_pe_dbg asm)
 
-# Retrieve the full path to the generated file of the 'freeldr_pe' target
-get_target_property(_freeldr_pe_output_file freeldr_pe LOCATION)
-
 concatenate_files(
     ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys
     ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin
-    ${_freeldr_pe_output_file})
+    ${CMAKE_CURRENT_BINARY_DIR}/freeldr_pe.dll)
 
 add_custom_target(freeldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys)
 
@@ -243,7 +240,7 @@ add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINAT
 concatenate_files(
     ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys
     ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin
-    ${_freeldr_pe_output_file})
+    ${CMAKE_CURRENT_BINARY_DIR}/freeldr_pe.dll)
 
 add_custom_target(setupldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys)
 add_cd_file(TARGET setupldr FILE ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys DESTINATION loader NO_CAB FOR bootcd regtest)
diff --git a/reactos/cmake/CMakeMacros.cmake b/reactos/cmake/CMakeMacros.cmake
index 8a0bb4bc352..5028dcf87b5 100644
--- a/reactos/cmake/CMakeMacros.cmake
+++ b/reactos/cmake/CMakeMacros.cmake
@@ -315,7 +315,7 @@ function(add_cd_file)
             endforeach()
             if(_CD_TARGET)
                 #manage dependency
-                add_dependencies(bootcd ${_CD_TARGET} converted_hives)
+                add_dependencies(bootcd ${_CD_TARGET} registry_inf)
             endif()
         else()
             #add it in reactos.cab
@@ -337,7 +337,7 @@ function(add_cd_file)
     if(NOT __cd EQUAL -1)
         #manage dependency
         if(_CD_TARGET)
-            add_dependencies(livecd ${_CD_TARGET} converted_hives)
+            add_dependencies(livecd ${_CD_TARGET} registry_inf)
         endif()
         foreach(item ${_CD_FILE})
             if(_CD_NAME_ON_CD)
@@ -385,7 +385,7 @@ function(add_cd_file)
             endforeach()
             if(_CD_TARGET)
                 #manage dependency
-                add_dependencies(bootcdregtest ${_CD_TARGET} converted_hives)
+                add_dependencies(bootcdregtest ${_CD_TARGET} registry_inf)
             endif()
         else()
             #add it in reactos.cab
@@ -668,7 +668,7 @@ endfunction()
 
 function(preprocess_file __in __out)
     set(__arg ${__in})
-    foreach(__def in ${ARGN})
+    foreach(__def ${ARGN})
         list(APPEND __arg -D${__def})
     endforeach()
     if(MSVC)
@@ -708,6 +708,78 @@ else()
     endfunction()
 endif()
 
+function(add_registry_inf)
+    # Add to the inf files list
+    foreach(_file ${ARGN})
+        set(_source_file "${CMAKE_CURRENT_SOURCE_DIR}/${_file}")
+        set_property(GLOBAL APPEND PROPERTY REGISTRY_INF_LIST ${_source_file})
+    endforeach()
+endfunction()
+
+function(create_registry_hives)
+
+    # Shortcut to the registry.inf file
+    set(_registry_inf "${CMAKE_BINARY_DIR}/boot/bootdata/registry.inf")
+
+    # Get the list of inf files
+    get_property(_inf_files GLOBAL PROPERTY REGISTRY_INF_LIST)
+
+    # Convert files to utf16le
+    foreach(_file ${_inf_files})
+        get_filename_component(_file_name ${_file} NAME_WE)
+        string(REPLACE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} _converted_file "${_file}")
+        string(REPLACE ${_file_name} "${_file_name}_utf16" _converted_file ${_converted_file})
+        add_custom_command(OUTPUT ${_converted_file}
+                           COMMAND native-utf16le ${_file} ${_converted_file}
+                           DEPENDS native-utf16le ${_file})
+        list(APPEND _converted_files ${_converted_file})
+    endforeach()
+
+    # Concatenate all registry files to registry.inf
+    concatenate_files(${_registry_inf} ${_converted_files})
+
+    # Add registry.inf to bootcd
+    add_custom_target(registry_inf DEPENDS ${_registry_inf})
+    add_cd_file(TARGET registry_inf
+                FILE ${_registry_inf}
+                DESTINATION reactos
+                NO_CAB
+                FOR bootcd regtest)
+
+    # livecd hives
+    list(APPEND _livecd_inf_files
+        ${_registry_inf}
+        ${CMAKE_SOURCE_DIR}/boot/bootdata/livecd.inf
+        ${CMAKE_SOURCE_DIR}/boot/bootdata/hiveinst.inf)
+
+    add_custom_command(
+        OUTPUT ${CMAKE_BINARY_DIR}/boot/bootdata/sam
+            ${CMAKE_BINARY_DIR}/boot/bootdata/default
+            ${CMAKE_BINARY_DIR}/boot/bootdata/security
+            ${CMAKE_BINARY_DIR}/boot/bootdata/software
+            ${CMAKE_BINARY_DIR}/boot/bootdata/system
+        COMMAND native-mkhive ${CMAKE_BINARY_DIR}/boot/bootdata/ ${_livecd_inf_files}
+        DEPENDS native-mkhive ${_livecd_inf_files})
+
+    add_custom_target(livecd_hives
+        DEPENDS ${CMAKE_BINARY_DIR}/boot/bootdata/sam
+            ${CMAKE_BINARY_DIR}/boot/bootdata/default
+            ${CMAKE_BINARY_DIR}/boot/bootdata/security
+            ${CMAKE_BINARY_DIR}/boot/bootdata/software
+            ${CMAKE_BINARY_DIR}/boot/bootdata/system)
+
+    add_cd_file(
+        FILE ${CMAKE_BINARY_DIR}/boot/bootdata/sam
+            ${CMAKE_BINARY_DIR}/boot/bootdata/default
+            ${CMAKE_BINARY_DIR}/boot/bootdata/security
+            ${CMAKE_BINARY_DIR}/boot/bootdata/software
+            ${CMAKE_BINARY_DIR}/boot/bootdata/system
+        TARGET livecd_hives
+        DESTINATION reactos/system32/config
+        FOR livecd)
+
+endfunction()
+
 if(KDBG)
     set(ROSSYM_LIB "rossym")
 else()
diff --git a/reactos/drivers/base/beep/CMakeLists.txt b/reactos/drivers/base/beep/CMakeLists.txt
index 3cc31bc8c06..371877599aa 100644
--- a/reactos/drivers/base/beep/CMakeLists.txt
+++ b/reactos/drivers/base/beep/CMakeLists.txt
@@ -3,3 +3,4 @@ add_library(beep SHARED beep.c beep.rc)
 set_module_type(beep kernelmodedriver)
 add_importlibs(beep ntoskrnl hal)
 add_cd_file(TARGET beep DESTINATION reactos/system32/drivers FOR all)
+add_registry_inf(beep_reg.inf)
diff --git a/reactos/drivers/base/beep/beep_reg.inf b/reactos/drivers/base/beep/beep_reg.inf
new file mode 100644
index 00000000000..c49f411f623
--- /dev/null
+++ b/reactos/drivers/base/beep/beep_reg.inf
@@ -0,0 +1,7 @@
+; Beep device driver
+[AddReg]
+HKLM,"SYSTEM\CurrentControlSet\Services\Beep","ErrorControl",0x00010001,0x00000000
+HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Group",0x00000000,"Base"
+HKLM,"SYSTEM\CurrentControlSet\Services\Beep","ImagePath",0x00020000,"system32\drivers\beep.sys"
+HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Start",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\Beep","Type",0x00010001,0x00000001
diff --git a/reactos/drivers/crypto/ksecdd/CMakeLists.txt b/reactos/drivers/crypto/ksecdd/CMakeLists.txt
index ae1bd441310..2bdb0475b83 100644
--- a/reactos/drivers/crypto/ksecdd/CMakeLists.txt
+++ b/reactos/drivers/crypto/ksecdd/CMakeLists.txt
@@ -19,3 +19,4 @@ target_link_libraries(ksecdd cryptlib pseh)
 set_module_type(ksecdd kernelmodedriver)
 add_importlibs(ksecdd ntoskrnl hal)
 add_cd_file(TARGET ksecdd DESTINATION reactos/system32/drivers NO_CAB FOR all)
+add_registry_inf(ksecdd_reg.inf)
diff --git a/reactos/drivers/crypto/ksecdd/ksecdd_reg.inf b/reactos/drivers/crypto/ksecdd/ksecdd_reg.inf
new file mode 100644
index 00000000000..953433a219b
--- /dev/null
+++ b/reactos/drivers/crypto/ksecdd/ksecdd_reg.inf
@@ -0,0 +1,7 @@
+; Kernel Security Support Provider Interface Driver
+[AddReg]
+HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","ErrorControl",0x00010001,0x00000003
+HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","Group",0x00000000,"Base"
+HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","ImagePath",0x00020000,"system32\drivers\ksecdd.sys"
+HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","Start",0x00010001,0x00000000
+HKLM,"SYSTEM\CurrentControlSet\Services\ksecdd","Type",0x00010001,0x00000001
diff --git a/reactos/drivers/filesystems/cdfs/CMakeLists.txt b/reactos/drivers/filesystems/cdfs/CMakeLists.txt
index 4c8bf3ceee6..08508f3ef88 100644
--- a/reactos/drivers/filesystems/cdfs/CMakeLists.txt
+++ b/reactos/drivers/filesystems/cdfs/CMakeLists.txt
@@ -23,3 +23,4 @@ target_link_libraries(cdfs ${PSEH_LIB})
 add_importlibs(cdfs ntoskrnl hal)
 add_pch(cdfs cdfs.h SOURCE)
 add_cd_file(TARGET cdfs DESTINATION reactos/system32/drivers NO_CAB FOR all)
+add_registry_inf(cdfs_reg.inf)
diff --git a/reactos/drivers/filesystems/cdfs/cdfs_reg.inf b/reactos/drivers/filesystems/cdfs/cdfs_reg.inf
new file mode 100644
index 00000000000..9ae7413c613
--- /dev/null
+++ b/reactos/drivers/filesystems/cdfs/cdfs_reg.inf
@@ -0,0 +1,7 @@
+; Cdfs (ISO96660) filesystem driver
+[AddReg]
+HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ErrorControl",0x00010001,0x00000000
+HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Group",0x00000000,"File System"
+HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ImagePath",0x00020000,"system32\drivers\cdfs.sys"
+HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Start",0x00010001,0x00000003
+HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Type",0x00010001,0x00000002
diff --git a/reactos/drivers/filesystems/msfs/CMakeLists.txt b/reactos/drivers/filesystems/msfs/CMakeLists.txt
index 350a2c61fba..f40db6fc749 100644
--- a/reactos/drivers/filesystems/msfs/CMakeLists.txt
+++ b/reactos/drivers/filesystems/msfs/CMakeLists.txt
@@ -12,3 +12,4 @@ set_module_type(msfs kernelmodedriver)
 add_importlibs(msfs ntoskrnl hal)
 add_pch(msfs msfs.h SOURCE)
 add_cd_file(TARGET msfs DESTINATION reactos/system32/drivers FOR all)
+add_registry_inf(msfs_reg.inf)
diff --git a/reactos/drivers/filesystems/msfs/msfs_reg.inf b/reactos/drivers/filesystems/msfs/msfs_reg.inf
new file mode 100644
index 00000000000..482f0ecaeed
--- /dev/null
+++ b/reactos/drivers/filesystems/msfs/msfs_reg.inf
@@ -0,0 +1,6 @@
+; Mailslot filesystem driver
+HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","ErrorControl",0x00010001,0x00000000
+HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","Group",0x00000000,"File System"
+HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","ImagePath",0x00020000,"system32\drivers\msfs.sys"
+HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","Start",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\Msfs","Type",0x00010001,0x00000002
diff --git a/reactos/drivers/filesystems/npfs/CMakeLists.txt b/reactos/drivers/filesystems/npfs/CMakeLists.txt
index 2c1c98ac1ee..dce6cda6534 100644
--- a/reactos/drivers/filesystems/npfs/CMakeLists.txt
+++ b/reactos/drivers/filesystems/npfs/CMakeLists.txt
@@ -28,3 +28,4 @@ target_link_libraries(npfs ${PSEH_LIB})
 add_importlibs(npfs ntoskrnl hal)
 add_pch(npfs npfs.h SOURCE)
 add_cd_file(TARGET npfs DESTINATION reactos/system32/drivers FOR all)
+add_registry_inf(npfs_reg.inf)
diff --git a/reactos/drivers/filesystems/npfs/npfs_reg.inf b/reactos/drivers/filesystems/npfs/npfs_reg.inf
new file mode 100644
index 00000000000..aff93e18320
--- /dev/null
+++ b/reactos/drivers/filesystems/npfs/npfs_reg.inf
@@ -0,0 +1,6 @@
+; Named Pipe filesystem driver
+HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","ErrorControl",0x00010001,0x00000000
+HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","Group",0x00000000,"File System"
+HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","ImagePath",0x00020000,"system32\drivers\npfs.sys"
+HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","Start",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","Type",0x00010001,0x00000002
diff --git a/reactos/drivers/input/kbdclass/CMakeLists.txt b/reactos/drivers/input/kbdclass/CMakeLists.txt
index 4e43d821567..326915a6c2c 100644
--- a/reactos/drivers/input/kbdclass/CMakeLists.txt
+++ b/reactos/drivers/input/kbdclass/CMakeLists.txt
@@ -14,3 +14,4 @@ add_pch(kbdclass kbdclass.h SOURCE)
 target_link_libraries(kbdclass ${PSEH_LIB})
 add_importlibs(kbdclass ntoskrnl hal)
 add_cd_file(TARGET kbdclass DESTINATION reactos/system32/drivers NO_CAB FOR all)
+add_registry_inf(kbdclass_reg.inf)
diff --git a/reactos/drivers/input/kbdclass/kbdclass_reg.inf b/reactos/drivers/input/kbdclass/kbdclass_reg.inf
new file mode 100644
index 00000000000..ec507e3f95f
--- /dev/null
+++ b/reactos/drivers/input/kbdclass/kbdclass_reg.inf
@@ -0,0 +1,9 @@
+; Keyboard class driver
+[AddReg]
+HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ErrorControl",0x00010001,0x00000000
+HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Group",0x00000000,"Keyboard Class"
+HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","ImagePath",0x00020000,"system32\drivers\kbdclass.sys"
+HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Start",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass","Type",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass\Parameters","ConnectMultiplePorts",0x00010001,1
+HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08002BE10318}","UpperFilters",0x00010000,"kbdclass"
diff --git a/reactos/drivers/input/mouclass/CMakeLists.txt b/reactos/drivers/input/mouclass/CMakeLists.txt
index e35a469d6b9..bf7714dfdf4 100644
--- a/reactos/drivers/input/mouclass/CMakeLists.txt
+++ b/reactos/drivers/input/mouclass/CMakeLists.txt
@@ -14,3 +14,4 @@ target_link_libraries(mouclass ${PSEH_LIB})
 add_importlibs(mouclass ntoskrnl hal)
 add_pch(mouclass mouclass.h SOURCE)
 add_cd_file(TARGET mouclass DESTINATION reactos/system32/drivers FOR all)
+add_registry_inf(mouclass_reg.inf)
diff --git a/reactos/drivers/input/mouclass/mouclass_reg.inf b/reactos/drivers/input/mouclass/mouclass_reg.inf
new file mode 100644
index 00000000000..5cc61e64f23
--- /dev/null
+++ b/reactos/drivers/input/mouclass/mouclass_reg.inf
@@ -0,0 +1,9 @@
+; Mouse class driver
+[AddReg]
+HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","ErrorControl",0x00010001,0x00000000
+HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Group",0x00000000,"Pointer Class"
+HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","ImagePath",0x00020000,"system32\drivers\mouclass.sys"
+HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Start",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Type",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\mouclass\Parameters","ConnectMultiplePorts",0x00010001,1
+HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96F-E325-11CE-BFC1-08002BE10318}","UpperFilters",0x00010000,"mouclass"
diff --git a/reactos/drivers/network/afd/CMakeLists.txt b/reactos/drivers/network/afd/CMakeLists.txt
index ae1a2db1dc7..bca14a940c9 100644
--- a/reactos/drivers/network/afd/CMakeLists.txt
+++ b/reactos/drivers/network/afd/CMakeLists.txt
@@ -24,3 +24,4 @@ set_module_type(afd kernelmodedriver)
 add_importlibs(afd ntoskrnl hal)
 add_pch(afd include/afd.h SOURCE)
 add_cd_file(TARGET afd DESTINATION reactos/system32/drivers FOR all)
+add_registry_inf(afd_reg.inf)
diff --git a/reactos/drivers/network/afd/afd_reg.inf b/reactos/drivers/network/afd/afd_reg.inf
new file mode 100644
index 00000000000..9a76e488d75
--- /dev/null
+++ b/reactos/drivers/network/afd/afd_reg.inf
@@ -0,0 +1,7 @@
+; Afd driver
+[AddReg]
+HKLM,"SYSTEM\CurrentControlSet\Services\Afd","ErrorControl",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Group",0x00000000,"TDI"
+HKLM,"SYSTEM\CurrentControlSet\Services\Afd","ImagePath",0x00020000,"system32\drivers\afd.sys"
+HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Start",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Type",0x00010001,0x00000001
diff --git a/reactos/drivers/storage/class/cdrom/CMakeLists.txt b/reactos/drivers/storage/class/cdrom/CMakeLists.txt
index 8ab07f20d63..cd2a01bca63 100644
--- a/reactos/drivers/storage/class/cdrom/CMakeLists.txt
+++ b/reactos/drivers/storage/class/cdrom/CMakeLists.txt
@@ -11,3 +11,4 @@ set_module_type(cdrom kernelmodedriver)
 add_importlibs(cdrom class2 scsiport ntoskrnl hal)
 add_pch(cdrom precomp.h SOURCE)
 add_cd_file(TARGET cdrom DESTINATION reactos/system32/drivers NO_CAB FOR all)
+add_registry_inf(cdrom_reg.inf)
diff --git a/reactos/drivers/storage/class/cdrom/cdrom_reg.inf b/reactos/drivers/storage/class/cdrom/cdrom_reg.inf
new file mode 100644
index 00000000000..0379b27ea36
--- /dev/null
+++ b/reactos/drivers/storage/class/cdrom/cdrom_reg.inf
@@ -0,0 +1,7 @@
+; Cdrom class driver
+[AddReg]
+HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","ErrorControl",0x00010001,0x00000000
+HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Group",0x00000000,"SCSI Class"
+HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","ImagePath",0x00020000,"system32\drivers\cdrom.sys"
+HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Start",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Type",0x00010001,0x00000001
diff --git a/reactos/drivers/storage/class/disk/CMakeLists.txt b/reactos/drivers/storage/class/disk/CMakeLists.txt
index e288906eaeb..0f33c2bc883 100644
--- a/reactos/drivers/storage/class/disk/CMakeLists.txt
+++ b/reactos/drivers/storage/class/disk/CMakeLists.txt
@@ -4,3 +4,4 @@ add_library(disk SHARED disk.c disk.rc)
 set_module_type(disk kernelmodedriver)
 add_importlibs(disk class2 scsiport ntoskrnl hal)
 add_cd_file(TARGET disk DESTINATION reactos/system32/drivers NO_CAB FOR all)
+add_registry_inf(disk_reg.inf)
diff --git a/reactos/drivers/storage/class/disk/disk_reg.inf b/reactos/drivers/storage/class/disk/disk_reg.inf
new file mode 100644
index 00000000000..0e265c0e333
--- /dev/null
+++ b/reactos/drivers/storage/class/disk/disk_reg.inf
@@ -0,0 +1,7 @@
+; Disk class driver
+[AddReg]
+HKLM,"SYSTEM\CurrentControlSet\Services\Disk","ErrorControl",0x00010001,0x00000000
+HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Group",0x00000000,"SCSI Class"
+HKLM,"SYSTEM\CurrentControlSet\Services\Disk","ImagePath",0x00020000,"system32\drivers\disk.sys"
+HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Start",0x00010001,0x00000000
+HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Type",0x00010001,0x00000001
diff --git a/reactos/drivers/storage/floppy/CMakeLists.txt b/reactos/drivers/storage/floppy/CMakeLists.txt
index 53659af344d..2c4d798df07 100644
--- a/reactos/drivers/storage/floppy/CMakeLists.txt
+++ b/reactos/drivers/storage/floppy/CMakeLists.txt
@@ -13,3 +13,4 @@ add_pch(floppy precomp.h SOURCE)
 set_module_type(floppy kernelmodedriver)
 add_importlibs(floppy hal ntoskrnl)
 add_cd_file(TARGET floppy DESTINATION reactos/system32/drivers NO_CAB FOR all)
+add_registry_inf(floppy_reg.inf)
diff --git a/reactos/drivers/storage/floppy/floppy_reg.inf b/reactos/drivers/storage/floppy/floppy_reg.inf
new file mode 100644
index 00000000000..ad620f4b3ee
--- /dev/null
+++ b/reactos/drivers/storage/floppy/floppy_reg.inf
@@ -0,0 +1,7 @@
+; Floppy driver
+[AddReg]
+HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","ErrorControl",0x00010001,0x00000000
+HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Group",0x00000000,"Primary Disk"
+HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","ImagePath",0x00020000,"system32\drivers\floppy.sys"
+HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Start",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\Floppy","Type",0x00010001,0x00000001
diff --git a/reactos/drivers/storage/ide/uniata/CMakeLists.txt b/reactos/drivers/storage/ide/uniata/CMakeLists.txt
index 49111be670b..5bb208d63c1 100644
--- a/reactos/drivers/storage/ide/uniata/CMakeLists.txt
+++ b/reactos/drivers/storage/ide/uniata/CMakeLists.txt
@@ -31,3 +31,4 @@ add_pch(uniata stdafx.h SOURCE)
 set_module_type(uniata kernelmodedriver)
 add_importlibs(uniata scsiport ntoskrnl hal)
 add_cd_file(TARGET uniata DESTINATION reactos/system32/drivers NO_CAB FOR all)
+add_registry_inf(uniata_reg.inf)
diff --git a/reactos/drivers/storage/ide/uniata/uniata_reg.inf b/reactos/drivers/storage/ide/uniata/uniata_reg.inf
new file mode 100644
index 00000000000..ce2faa0bf97
--- /dev/null
+++ b/reactos/drivers/storage/ide/uniata/uniata_reg.inf
@@ -0,0 +1,8 @@
+; UniATA/Atapi miniport driver
+[AddReg]
+HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ErrorControl",0x00010001,0x00000000
+HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Group",0x00000000,"System Bus Extender"
+HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ImagePath",0x00020000,"system32\drivers\uniata.sys"
+HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Start",0x00010001,0x00000000
+HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Type",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Tag",0x00010001,0x00000010
diff --git a/reactos/drivers/storage/port/buslogic/CMakeLists.txt b/reactos/drivers/storage/port/buslogic/CMakeLists.txt
index 300fcd023c6..7865fa4514c 100644
--- a/reactos/drivers/storage/port/buslogic/CMakeLists.txt
+++ b/reactos/drivers/storage/port/buslogic/CMakeLists.txt
@@ -4,3 +4,4 @@ target_link_libraries(buslogic libcntpr)
 set_module_type(buslogic kernelmodedriver)
 add_importlibs(buslogic scsiport)
 add_cd_file(TARGET buslogic DESTINATION reactos/system32/drivers NO_CAB FOR all)
+add_registry_inf(buslogic_reg.inf)
diff --git a/reactos/drivers/storage/port/buslogic/buslogic_reg.inf b/reactos/drivers/storage/port/buslogic/buslogic_reg.inf
new file mode 100644
index 00000000000..a089c52172e
--- /dev/null
+++ b/reactos/drivers/storage/port/buslogic/buslogic_reg.inf
@@ -0,0 +1,8 @@
+; BusLogic 958 miniport driver
+[AddReg]
+HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","ErrorControl",0x00010001,0x00000000
+HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Group",0x00000000,"SCSI Miniport"
+HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","ImagePath",0x00020000,"system32\drivers\buslogic.sys"
+HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Start",0x00010001,0x00000000
+HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Type",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\BusLogic","Tag",0x00010001,0x00000020
diff --git a/reactos/win32ss/drivers/miniport/vbe/CMakeLists.txt b/reactos/win32ss/drivers/miniport/vbe/CMakeLists.txt
index b60f14f48ce..223bb2e354f 100644
--- a/reactos/win32ss/drivers/miniport/vbe/CMakeLists.txt
+++ b/reactos/win32ss/drivers/miniport/vbe/CMakeLists.txt
@@ -10,3 +10,4 @@ add_importlibs(vbemp videoprt)
 add_pch(vbemp vbemp.h SOURCE)
 target_link_libraries(vbemp libcntpr)
 add_cd_file(TARGET vbemp DESTINATION reactos/system32/drivers FOR all)
+add_registry_inf(vbemp_reg.inf)
diff --git a/reactos/win32ss/drivers/miniport/vbe/vbemp_reg.inf b/reactos/win32ss/drivers/miniport/vbe/vbemp_reg.inf
new file mode 100644
index 00000000000..37e80178270
--- /dev/null
+++ b/reactos/win32ss/drivers/miniport/vbe/vbemp_reg.inf
@@ -0,0 +1,27 @@
+; VBE SVGA driver
+[AddReg]
+HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ErrorControl",0x00010001,0x00000000
+HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Group",0x00000000,"Video Save"
+HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ImagePath",0x00020000,"system32\drivers\vbemp.sys"
+HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Start",0x00010001,0x00000004
+HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Type",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Tag",0x00010001,0x00000001
+
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","InstalledDisplayDrivers",0x00010000,"framebuf"
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.VRefresh",0x00010001,1
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.BitsPerPel",0x00010001,8
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XResolution",0x00010001,640
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YResolution",0x00010001,480
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.FixedOutput",0x00010001,0
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.Flags",0x00010001,0
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.Orientation",0x00010001,0
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XPanning",0x00010001,0
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YPanning",0x00010001,0
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.RelativeX",0x00010001,0
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.RelativeY",0x00010001,0
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.ToDesktop",0x00010001,1
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Attach.PrimaryDevice",0x00010001,1
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","Device Description",0x00020000,"Generic VESA Adapter"
+
+; This is not true but it allows to use 3rd party drivers while having the VBE driver installed
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","VgaCompatible",0x00010001,1
diff --git a/reactos/win32ss/drivers/miniport/vga/CMakeLists.txt b/reactos/win32ss/drivers/miniport/vga/CMakeLists.txt
index e9851f0a862..63059f07ce6 100644
--- a/reactos/win32ss/drivers/miniport/vga/CMakeLists.txt
+++ b/reactos/win32ss/drivers/miniport/vga/CMakeLists.txt
@@ -9,3 +9,4 @@ set_module_type(vgamp kernelmodedriver)
 add_importlibs(vgamp videoprt)
 add_pch(vgamp vgamp.h SOURCE)
 add_cd_file(TARGET vgamp DESTINATION reactos/system32/drivers FOR all)
+add_registry_inf(vga_reg.inf)
diff --git a/reactos/win32ss/drivers/miniport/vga/vga_reg.inf b/reactos/win32ss/drivers/miniport/vga/vga_reg.inf
new file mode 100644
index 00000000000..28d2d4eed8a
--- /dev/null
+++ b/reactos/win32ss/drivers/miniport/vga/vga_reg.inf
@@ -0,0 +1,15 @@
+; VGA miniport driver
+[AddReg]
+HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ErrorControl",0x00010001,0x00000000
+HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Group",0x00000000,"Video Save"
+HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ImagePath",0x00020000,"system32\drivers\vgamp.sys"
+HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Start",0x00010001,0x00000004
+HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Type",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Tag",0x00010001,0x00000002
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","VgaCompatible",0x00010001,1
+
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","InstalledDisplayDrivers",0x00010000,"vgaddi"
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.VRefresh",0x00010001,1
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.BitsPerPel",0x00010001,8
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.XResolution",0x00010001,640
+HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","DefaultSettings.YResolution",0x00010001,480