diff --git a/importlibs/libcsrsrv.a b/importlibs/libcsrsrv.a
new file mode 100644
index 00000000000..02b4a08cedd
Binary files /dev/null and b/importlibs/libcsrsrv.a differ
diff --git a/importlibs/libsmdll.a b/importlibs/libsmdll.a
new file mode 100644
index 00000000000..31a27fcaba0
Binary files /dev/null and b/importlibs/libsmdll.a differ
diff --git a/subsystems/win32/CMakeLists.txt b/subsystems/win32/CMakeLists.txt
index f62849a601a..f7e923f7976 100644
--- a/subsystems/win32/CMakeLists.txt
+++ b/subsystems/win32/CMakeLists.txt
@@ -1,2 +1,3 @@
 
+add_subdirectory(csrss)
 add_subdirectory(win32k)
diff --git a/subsystems/win32/csrss/CMakeLists.txt b/subsystems/win32/csrss/CMakeLists.txt
new file mode 100644
index 00000000000..3994a8c4be0
--- /dev/null
+++ b/subsystems/win32/csrss/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+include_directories(include)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers)
+
+add_executable(csrss csrss.c csrss.rc)
+
+set_module_type(csrss nativecui)
+
+target_link_libraries(csrss nt)
+
+add_importlibs(csrss ntdll csrsrv)
+
+add_dependencies(csrss psdk bugcodes)
+
+add_subdirectory(csrsrv)
+add_subdirectory(win32csr)
diff --git a/subsystems/win32/csrss/csrsrv/CMakeLists.txt b/subsystems/win32/csrss/csrsrv/CMakeLists.txt
new file mode 100644
index 00000000000..af0fc7ae427
--- /dev/null
+++ b/subsystems/win32/csrss/csrsrv/CMakeLists.txt
@@ -0,0 +1,27 @@
+
+include_directories(${REACTOS_SOURCE_DIR}/subsystems/win32/csrss/include)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
+
+spec2def(csrsrv ${CMAKE_CURRENT_SOURCE_DIR}/csrsrv.spec ${CMAKE_CURRENT_BINARY_DIR}/csrsrv.def)
+
+list(APPEND SOURCE
+    api/process.c
+    api/user.c
+    api/wapi.c
+    procsup.c
+    thredsup.c
+    init.c)
+
+add_library(csrsrv SHARED ${CMAKE_CURRENT_BINARY_DIR}/csrsrv_srv.h.gch ${SOURCE})
+
+target_link_libraries(csrsrv
+    ${CMAKE_CURRENT_BINARY_DIR}/csrsrv.def
+    pseh)
+
+set_module_type(csrsrv nativedll)
+
+add_importlibs(csrsrv ntdll smdll)
+
+add_pch(csrsrv ${CMAKE_CURRENT_SOURCE_DIR}/srv.h ${SOURCE})
+
+add_dependencies(csrsrv csrsrv_def psdk bugcodes)
diff --git a/subsystems/win32/csrss/win32csr/CMakeLists.txt b/subsystems/win32/csrss/win32csr/CMakeLists.txt
new file mode 100644
index 00000000000..e468f3832fc
--- /dev/null
+++ b/subsystems/win32/csrss/win32csr/CMakeLists.txt
@@ -0,0 +1,41 @@
+
+include_directories(BEFORE .)
+include_directories(${REACTOS_SOURCE_DIR}/subsystems/win32/csrss/include)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers)
+include_directories(${REACTOS_SOURCE_DIR}/dll/cpl/console)
+
+spec2def(win32csr ${CMAKE_CURRENT_SOURCE_DIR}/win32csr.spec ${CMAKE_CURRENT_BINARY_DIR}/win32csr.def)
+
+set_rc_compiler()
+
+list(APPEND SOURCE
+    alias.c
+    appswitch.c
+    coninput.c
+    conoutput.c
+    console.c
+    desktopbg.c
+    dllmain.c
+    exitros.c
+    guiconsole.c
+    handle.c
+    harderror.c
+    lineinput.c
+    tuiconsole.c
+    win32csr.rc)
+
+add_library(win32csr SHARED ${CMAKE_CURRENT_BINARY_DIR}/win32csr_w32csr.h.gch ${SOURCE})
+
+target_link_libraries(win32csr
+    ${CMAKE_CURRENT_BINARY_DIR}/win32csr.def
+    win32ksys
+    pseh)
+
+set_module_type(win32csr win32dll)
+
+add_importlibs(win32csr ntdll user32 gdi32 advapi32 psapi)
+
+add_pch(win32csr ${CMAKE_CURRENT_SOURCE_DIR}/w32csr.h ${SOURCE})
+
+add_dependencies(win32csr win32csr_def psdk bugcodes)