diff --git a/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt b/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt
index 26989823cf9..6d96ca4c6b5 100644
--- a/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt
+++ b/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt
@@ -19,11 +19,6 @@ target_link_libraries(csrsrv ${PSEH_LIB})
 
 set_module_type(csrsrv nativedll)
 
-if(MSVC)
-set_entrypoint(csrsrv DllMainCRTStartup)
-endif()
-
-
 add_importlibs(csrsrv ntdll smdll)
 
 add_pch(csrsrv srv.h)
diff --git a/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rbuild b/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rbuild
index c7b9b53acff..987ed18944d 100644
--- a/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rbuild
+++ b/reactos/subsystems/win32/csrss/csrsrv/csrsrv.rbuild
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="csrsrv" type="nativedll" installbase="system32" installname="csrsrv.dll">
+<module name="csrsrv" type="nativedll" entrypoint="DllMain@12" installbase="system32" installname="csrsrv.dll">
 	<importlibrary definition="csrsrv.spec" />
 	<include base="csrsrv">.</include>
 	<include base="csrss">.</include>
diff --git a/reactos/subsystems/win32/csrss/csrsrv/init.c b/reactos/subsystems/win32/csrss/csrsrv/init.c
index b10527e4078..2296b3ad3c2 100644
--- a/reactos/subsystems/win32/csrss/csrsrv/init.c
+++ b/reactos/subsystems/win32/csrss/csrsrv/init.c
@@ -778,9 +778,9 @@ CsrServerInitialization(ULONG ArgumentCount,
 
 BOOL
 NTAPI
-DllMainCRTStartup(HANDLE hDll,
-                  DWORD dwReason,
-                  LPVOID lpReserved)
+DllMain(HANDLE hDll,
+        DWORD dwReason,
+        LPVOID lpReserved)
 {
     /* We don't do much */
     UNREFERENCED_PARAMETER(hDll);