diff --git a/drivers/battery/battc/CMakeLists.txt b/drivers/battery/battc/CMakeLists.txt
index d7543bd556d..43dbb99cf3c 100644
--- a/drivers/battery/battc/CMakeLists.txt
+++ b/drivers/battery/battc/CMakeLists.txt
@@ -3,8 +3,6 @@ set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FL
 
 add_definitions(-D_BATTERYCLASS_)
 
-spec2def(battc ${CMAKE_CURRENT_SOURCE_DIR}/battc.spec ${CMAKE_CURRENT_BINARY_DIR}/battc.def)
-
 add_library(battc SHARED battc.c battc.rc)
 
 set_target_properties(battc PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys")
diff --git a/drivers/storage/CMakeLists.txt b/drivers/storage/CMakeLists.txt
index 624ddd5093f..55d672b7c87 100644
--- a/drivers/storage/CMakeLists.txt
+++ b/drivers/storage/CMakeLists.txt
@@ -1,4 +1,5 @@
 
+add_subdirectory(class)
 add_subdirectory(ide)
 add_subdirectory(port)
 add_subdirectory(scsiport)
diff --git a/drivers/storage/class/CMakeLists.txt b/drivers/storage/class/CMakeLists.txt
new file mode 100644
index 00000000000..d3fd268b523
--- /dev/null
+++ b/drivers/storage/class/CMakeLists.txt
@@ -0,0 +1,5 @@
+
+add_subdirectory(cdrom)
+add_subdirectory(class2)
+add_subdirectory(disk)
+add_subdirectory(ramdisk)
diff --git a/drivers/storage/class/cdrom/CMakeLists.txt b/drivers/storage/class/cdrom/CMakeLists.txt
new file mode 100644
index 00000000000..3c4377e2f90
--- /dev/null
+++ b/drivers/storage/class/cdrom/CMakeLists.txt
@@ -0,0 +1,16 @@
+
+set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
+
+include_directories(..)
+
+add_library(cdrom SHARED cdrom.c findscsi.c cdrom.rc)
+
+set_target_properties(cdrom PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys")
+
+target_link_libraries(cdrom
+    ${REACTOS_SOURCE_DIR}/drivers/storage/class/class2/libclass2.a
+    ${REACTOS_SOURCE_DIR}/drivers/storage/scsiport/libscsiport.a
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a
+    ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a)
+
+add_dependencies(cdrom psdk bugcodes)
diff --git a/drivers/storage/class/class2/CMakeLists.txt b/drivers/storage/class/class2/CMakeLists.txt
new file mode 100644
index 00000000000..5ad2fa8cdb9
--- /dev/null
+++ b/drivers/storage/class/class2/CMakeLists.txt
@@ -0,0 +1,18 @@
+
+set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
+
+include_directories(..)
+
+spec2def(class2 ${CMAKE_CURRENT_SOURCE_DIR}/class2.spec ${CMAKE_CURRENT_BINARY_DIR}/class2.def)
+
+add_library(class2 SHARED class2.c class2.rc)
+
+set_target_properties(class2 PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys")
+
+target_link_libraries(class2
+    ${CMAKE_CURRENT_BINARY_DIR}/class2.def
+    ${REACTOS_SOURCE_DIR}/drivers/storage/scsiport/libscsiport.a 
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a
+    ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a)
+
+add_dependencies(class2 class2_def psdk bugcodes)
diff --git a/drivers/storage/class/class2/libclass2.a b/drivers/storage/class/class2/libclass2.a
new file mode 100644
index 00000000000..35f2a58c33f
Binary files /dev/null and b/drivers/storage/class/class2/libclass2.a differ
diff --git a/drivers/storage/class/disk/CMakeLists.txt b/drivers/storage/class/disk/CMakeLists.txt
new file mode 100644
index 00000000000..54dcf320698
--- /dev/null
+++ b/drivers/storage/class/disk/CMakeLists.txt
@@ -0,0 +1,16 @@
+
+set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
+
+include_directories(..)
+
+add_library(disk SHARED disk.c disk.rc)
+
+set_target_properties(disk PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys")
+
+target_link_libraries(disk
+    ${REACTOS_SOURCE_DIR}/drivers/storage/class/class2/libclass2.a
+    ${REACTOS_SOURCE_DIR}/drivers/storage/scsiport/libscsiport.a
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a
+    ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a)
+
+add_dependencies(disk psdk bugcodes)
diff --git a/drivers/storage/class/ramdisk/CMakeLists.txt b/drivers/storage/class/ramdisk/CMakeLists.txt
new file mode 100644
index 00000000000..ff7551205be
--- /dev/null
+++ b/drivers/storage/class/ramdisk/CMakeLists.txt
@@ -0,0 +1,14 @@
+
+set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
+
+include_directories(..)
+
+add_library(ramdisk SHARED ramdisk.c ramdisk.rc)
+
+set_target_properties(ramdisk PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys")
+
+target_link_libraries(ramdisk
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a
+    ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a)
+
+add_dependencies(ramdisk psdk bugcodes)