diff --git a/CMakeLists.txt b/CMakeLists.txt
index 05989403579..6e8238fc673 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -127,12 +127,11 @@ file(MAKE_DIRECTORY "${LIVECD_DIR}/Profiles/Default User")
 file(MAKE_DIRECTORY "${LIVECD_DIR}/Profiles/Default User/Desktop")
 file(MAKE_DIRECTORY "${LIVECD_DIR}/Profiles/Default User/My Documents")
 file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos")
+file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/inf")
 file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/fonts")
 file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/system32")
 file(MAKE_DIRECTORY "${LIVECD_DIR}/reactos/system32/config")
 
-
-
 add_custom_command(
     OUTPUT ${REACTOS_BINARY_DIR}/livecd.iso
     COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/boot/freeldr/bootsect/isoboot.bin ${LIVECD_DIR} REACTOS ${REACTOS_BINARY_DIR}/livecd.iso
diff --git a/media/CMakeLists.txt b/media/CMakeLists.txt
index fad730848af..84852fb8510 100644
--- a/media/CMakeLists.txt
+++ b/media/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_subdirectory(fonts)
+add_subdirectory(inf)
 add_subdirectory(nls)
\ No newline at end of file
diff --git a/media/inf/CMakeLists.txt b/media/inf/CMakeLists.txt
new file mode 100644
index 00000000000..ffef1c15d3a
--- /dev/null
+++ b/media/inf/CMakeLists.txt
@@ -0,0 +1,6 @@
+file(GLOB NLS_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.inf")
+foreach(item ${NLS_FILES})
+    add_livecd("${CMAKE_CURRENT_SOURCE_DIR}/${item}" reactos/inf ${item})
+endforeach(item)
+
+add_livecd(${CMAKE_CURRENT_SOURCE_DIR}/syssetup.inf.trunk reactos/inf syssetup.inf)
\ No newline at end of file
diff --git a/media/inf/syssetup.inf.trunk b/media/inf/syssetup.inf.trunk
new file mode 100644
index 00000000000..8aba811299a
--- /dev/null
+++ b/media/inf/syssetup.inf.trunk
@@ -0,0 +1,83 @@
+[Version]
+Signature = $Windows NT$
+ClassGUID = {00000000-0000-0000-0000-000000000000}
+
+[DeviceInfsToInstall]
+battery.inf
+cdrom.inf
+display.inf
+fdc.inf
+hdc.inf
+keyboard.inf
+machine.inf
+msmouse.inf
+NET_NIC.inf
+ports.inf
+scsi.inf
+usbport.inf
+audio.inf
+ks.inf
+
+[RegistrationPhase2]
+RegisterDlls = OleControlDlls
+
+[OleControlDlls]
+11,,actxprxy.dll,1
+11,,amstream.dll,1
+11,,atl.dll,1
+11,,avifil32.dll,1
+11,,browseui.dll,1
+11,,comcat.dll,1
+11,,comctl32.dll,2
+11,,cryptdlg.dll,1
+11,,cryptnet.dll,1
+11,,ddraw.dll,1
+11,,devenum.dll,1
+11,,dinput.dll,1
+11,,dinput8.dll,1
+11,,dmusic.dll,1
+11,,dplayx.dll,1
+11,,dsound.dll,1
+11,,dxdiagn.dll,1
+11,,hhctrl.ocx,1
+11,,hlink.dll,1
+11,,hnetcfg.dll,1
+11,,inetcomm.dll,1
+11,,inseng.dll,1
+11,,itss.dll,1
+11,,jscript.dll,1
+11,,ksproxy.ax,1
+11,,mlang.dll,1
+11,,mscat32.dll,1
+11,,msctf.dll,1
+11,,mshtml.dll,3
+11,,msi.dll,1
+11,,msimtf.dll,1
+11,,msisip.dll,1
+11,,mstask.dll,1
+11,,msxml3.dll,1
+11,,netcfgx.dll,1
+11,,netshell.dll,1
+11,,objsel.dll,1
+11,,ole32.dll,1
+11,,oleacc.dll,1
+11,,oleaut32.dll,1
+11,,olepro32.dll,1
+11,,pstorec.dll,1
+11,,qedit.dll,1
+11,,qmgr.dll,1
+11,,qmgrprxy.dll,1
+11,,quartz.dll,1
+11,,rpcrt4.dll,1
+11,,rsabase.dll,1
+11,,rsaenh.dll,1
+11,,shdocvw.dll,3
+11,,shell32.dll,3
+11,,softpub.dll,1
+11,,sti.dll,1
+11,,urlmon.dll,3
+11,,windowscodecs.dll,1
+11,,winhttp.dll,1
+11,,wininet.dll,2
+11,,wintrust.dll,1
+11,,wuapi.dll,1