diff --git a/drivers/bus/CMakeLists.txt b/drivers/bus/CMakeLists.txt
index 5aee72eac88..555335670b5 100644
--- a/drivers/bus/CMakeLists.txt
+++ b/drivers/bus/CMakeLists.txt
@@ -1,3 +1,3 @@
 
 add_subdirectory(acpi)
-
+add_subdirectory(isapnp)
diff --git a/drivers/bus/isapnp/CMakeLists.txt b/drivers/bus/isapnp/CMakeLists.txt
new file mode 100644
index 00000000000..a2594389236
--- /dev/null
+++ b/drivers/bus/isapnp/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+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>")
+
+add_library(isapnp SHARED
+    isapnp.c
+    pdo.c
+    fdo.c
+    hardware.c
+    isapnp.rc)
+
+set_target_properties(isapnp PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys")
+
+target_link_libraries(isapnp
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a
+    ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a)
+
+add_dependencies(isapnp psdk bugcodes)
diff --git a/drivers/filesystems/CMakeLists.txt b/drivers/filesystems/CMakeLists.txt
index 8ba284bcfbf..e53e77185bb 100644
--- a/drivers/filesystems/CMakeLists.txt
+++ b/drivers/filesystems/CMakeLists.txt
@@ -1,2 +1,3 @@
 
 add_subdirectory(cdfs)
+add_subdirectory(fastfat)
diff --git a/drivers/filesystems/fastfat/CMakeLists.txt b/drivers/filesystems/fastfat/CMakeLists.txt
new file mode 100644
index 00000000000..57b7b2ea4fe
--- /dev/null
+++ b/drivers/filesystems/fastfat/CMakeLists.txt
@@ -0,0 +1,36 @@
+
+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>")
+
+list(APPEND SOURCE
+    blockdev.c
+    cleanup.c
+    close.c
+    create.c
+    dir.c
+    direntry.c
+    dirwr.c
+    ea.c
+    fat.c
+    fastio.c
+    fcb.c
+    finfo.c
+    flush.c
+    fsctl.c
+    iface.c
+    misc.c
+    rw.c
+    shutdown.c
+    string.c
+    volume.c
+    vfatfs.rc)
+
+add_library(fastfat SHARED ${CMAKE_CURRENT_BINARY_DIR}/fastfat_vfat.h.gch ${SOURCE})
+
+set_target_properties(fastfat PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys")
+
+target_link_libraries(fastfat
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a
+    ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a)
+
+add_pch(fastfat ${CMAKE_CURRENT_SOURCE_DIR}/vfat.h ${SOURCE})
+add_dependencies(fastfat psdk bugcodes)