diff --git a/reactos/boot/bootdata/CMakeLists.txt b/reactos/boot/bootdata/CMakeLists.txt
index 9fdf6bdf8db..0a1af10772d 100644
--- a/reactos/boot/bootdata/CMakeLists.txt
+++ b/reactos/boot/bootdata/CMakeLists.txt
@@ -18,7 +18,9 @@ add_registry_inf(
 add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcdregtest/regtest.cmd DESTINATION reactos/bin FOR all)
 
 #autorun.inf
-add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/autorun.inf DESTINATION root NO_CAB NOT_IN_HYBRIDCD FOR all hybridcd)
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/autorun-bootcd.inf DESTINATION root NO_CAB NOT_IN_HYBRIDCD NAME_ON_CD autorun.inf FOR bootcd)
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/autorun-livecd.inf DESTINATION root NO_CAB NOT_IN_HYBRIDCD NAME_ON_CD autorun.inf FOR livecd)
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/autorun-hybridcd.inf DESTINATION root NO_CAB NOT_IN_HYBRIDCD NAME_ON_CD autorun.inf FOR hybridcd)
 
 #icon.ico
 add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/icon.ico DESTINATION root NO_CAB NOT_IN_HYBRIDCD FOR all hybridcd)
diff --git a/reactos/boot/bootdata/autorun.inf b/reactos/boot/bootdata/autorun-bootcd.inf
similarity index 100%
rename from reactos/boot/bootdata/autorun.inf
rename to reactos/boot/bootdata/autorun-bootcd.inf
diff --git a/reactos/boot/bootdata/autorun-hybridcd.inf b/reactos/boot/bootdata/autorun-hybridcd.inf
new file mode 100644
index 00000000000..cfab23fde0a
--- /dev/null
+++ b/reactos/boot/bootdata/autorun-hybridcd.inf
@@ -0,0 +1,3 @@
+[autorun]
+open=bootcd\reactos\welcome.exe
+icon=icon.ico
diff --git a/reactos/boot/bootdata/autorun-livecd.inf b/reactos/boot/bootdata/autorun-livecd.inf
new file mode 100644
index 00000000000..a67d6efdbd3
--- /dev/null
+++ b/reactos/boot/bootdata/autorun-livecd.inf
@@ -0,0 +1,3 @@
+[autorun]
+open=readme.txt
+icon=icon.ico