diff --git a/media/CMakeLists.txt b/media/CMakeLists.txt
index 2f8cecc8b22..699d2ff141a 100644
--- a/media/CMakeLists.txt
+++ b/media/CMakeLists.txt
@@ -3,6 +3,7 @@ add_subdirectory(fonts)
 add_subdirectory(inf)
 add_subdirectory(nls)
 add_subdirectory(sdb)
+add_subdirectory(sounds)
 add_subdirectory(themes)
 add_subdirectory(vgafonts)
 
@@ -11,8 +12,6 @@ add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/KDBinit DESTINATION rea
 add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/networks DESTINATION reactos/system32/drivers/etc FOR all)
 add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/protocol DESTINATION reactos/system32/drivers/etc FOR all)
 add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/services DESTINATION reactos/system32/drivers/etc FOR all)
-add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/sounds/ReactOS_LogOn.wav DESTINATION reactos/media FOR all)
-add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/sounds/ReactOS_Recycle.wav DESTINATION reactos/media FOR all)
 
 add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/systemcompatible.manifest DESTINATION reactos/winsxs/manifests FOR all)
 add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/forwardcompatible.manifest DESTINATION reactos/winsxs/manifests FOR all)
diff --git a/media/sounds/CMakeLists.txt b/media/sounds/CMakeLists.txt
new file mode 100644
index 00000000000..03da1c51adc
--- /dev/null
+++ b/media/sounds/CMakeLists.txt
@@ -0,0 +1,5 @@
+
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_Critical_Stop.wav DESTINATION reactos/media FOR all)
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_LogOn.wav DESTINATION reactos/media FOR all)
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_Notify.wav DESTINATION reactos/media FOR all)
+add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_Recycle.wav DESTINATION reactos/media FOR all)
diff --git a/media/sounds/ReactOS_Critical_Stop.wav b/media/sounds/ReactOS_Critical_Stop.wav
new file mode 100644
index 00000000000..9a446908acc
Binary files /dev/null and b/media/sounds/ReactOS_Critical_Stop.wav differ
diff --git a/media/sounds/ReactOS_Notify.wav b/media/sounds/ReactOS_Notify.wav
new file mode 100644
index 00000000000..2b6056c1fe7
Binary files /dev/null and b/media/sounds/ReactOS_Notify.wav differ