diff --git a/media/CMakeLists.txt b/media/CMakeLists.txt
index 54c546e7a3c..fad730848af 100644
--- a/media/CMakeLists.txt
+++ b/media/CMakeLists.txt
@@ -1,3 +1,2 @@
-add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/nls/l_intl.nls reactos l_intl.nls)
-add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/nls/c_437.nls reactos c_437.nls)
-add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/nls/c_1252.nls reactos c_1252.nls)
\ No newline at end of file
+add_subdirectory(fonts)
+add_subdirectory(nls)
\ No newline at end of file
diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt
new file mode 100644
index 00000000000..3cb7ef08099
--- /dev/null
+++ b/media/fonts/CMakeLists.txt
@@ -0,0 +1,4 @@
+file(GLOB NLS_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.ttf")
+foreach(item ${NLS_FILES})
+    add_livecd("${CMAKE_CURRENT_SOURCE_DIR}/${item}" reactos/fonts ${item})
+endforeach(item)
\ No newline at end of file
diff --git a/media/nls/CMakeLists.txt b/media/nls/CMakeLists.txt
new file mode 100644
index 00000000000..62166b9ef31
--- /dev/null
+++ b/media/nls/CMakeLists.txt
@@ -0,0 +1,8 @@
+add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/l_intl.nls reactos l_intl.nls)
+add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/c_437.nls reactos c_437.nls)
+add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/c_1252.nls reactos c_1252.nls)
+
+file(GLOB NLS_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.nls")
+foreach(item ${NLS_FILES})
+    add_livecd("${CMAKE_CURRENT_SOURCE_DIR}/${item}" reactos/system32 ${item})
+endforeach(item)
\ No newline at end of file