diff --git a/drivers/usb/CMakeLists.txt b/drivers/usb/CMakeLists.txt
index 156dcd2c319..4be624d2bb5 100644
--- a/drivers/usb/CMakeLists.txt
+++ b/drivers/usb/CMakeLists.txt
@@ -1,3 +1,6 @@
 
 add_subdirectory(nt4compat)
 add_subdirectory(usbd)
+add_subdirectory(usbehci)
+#add_subdirectory(usbhub) Compiles, just skipped in trunk
+#add_subdirectory(usbstor) Compiles, just skipped in trunk
diff --git a/drivers/usb/usbd/CMakeLists.txt b/drivers/usb/usbd/CMakeLists.txt
index a25decd9292..d3846f52c5a 100644
--- a/drivers/usb/usbd/CMakeLists.txt
+++ b/drivers/usb/usbd/CMakeLists.txt
@@ -8,3 +8,4 @@ add_library(usbd SHARED
 
 set_module_type(usbd kernelmodedriver)
 add_importlibs(usbd ntoskrnl hal)
+add_importlib_target(usbd.spec usbd.sys)
diff --git a/drivers/usb/usbehci/CMakeLists.txt b/drivers/usb/usbehci/CMakeLists.txt
new file mode 100644
index 00000000000..0d8a7ba0cf5
--- /dev/null
+++ b/drivers/usb/usbehci/CMakeLists.txt
@@ -0,0 +1,21 @@
+
+list(APPEND SOURCE
+    usbehci.c
+    hardware.c
+    physmem.c
+    hwiface.c
+    transfer.c
+    fdo.c
+    pdo.c
+    common.c
+    misc.c
+    irp.c
+    usbiffn.c
+    usbehci.rc)
+
+add_library(usbehci SHARED ${SOURCE})
+
+set_module_type(usbehci kernelmodedriver)
+add_importlibs(usbehci ntoskrnl hal)
+
+add_cab_target(usbehci 2)
diff --git a/drivers/usb/usbhub/CMakeLists.txt b/drivers/usb/usbhub/CMakeLists.txt
new file mode 100644
index 00000000000..60c165f4e35
--- /dev/null
+++ b/drivers/usb/usbhub/CMakeLists.txt
@@ -0,0 +1,15 @@
+
+list(APPEND SOURCE
+    createclose.c
+    fdo.c
+    misc.c
+    pdo.c
+    usbhub.c
+    usbhub.rc)
+
+add_library(usbhub SHARED ${SOURCE})
+
+set_module_type(usbhub kernelmodedriver)
+add_importlibs(usbhub ntoskrnl hal usbd)
+
+add_cab_target(usbhub 2)
diff --git a/drivers/usb/usbstor/CMakeLists.txt b/drivers/usb/usbstor/CMakeLists.txt
new file mode 100644
index 00000000000..041ce3947b1
--- /dev/null
+++ b/drivers/usb/usbstor/CMakeLists.txt
@@ -0,0 +1,10 @@
+
+add_definitions(-DDEBUG_MODE)
+
+include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
+
+add_library(usbstor SHARED usbstor.c usbstor.rc)
+
+set_module_type(usbstor kernelmodedriver)
+add_importlibs(usbstor ntoskrnl hal)
+add_cab_target(usbstor 2)