diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index e283f6ed720..2de89cd16e2 100644
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
@@ -2623,9 +2623,10 @@ MingwKernelModuleHandler::GenerateKernelModuleTarget ()
 
 		string dependencies = linkDepsMacro + " " + objectsMacro;
 
-		string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s",
-		                                     module.GetEntryPoint(true).c_str (),
-		                                     module.baseaddress.c_str () );
+        string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s",
+                                            module.GetEntryPoint(!(Environment::GetArch() == "arm")).c_str (),
+                                            module.baseaddress.c_str () );
+        
 		GenerateLinkerCommand ( dependencies,
 					"${gcc}",
 					linkerParameters + " $(NTOSKRNL_SHARED)",
diff --git a/reactos/tools/rbuild/module.cpp b/reactos/tools/rbuild/module.cpp
index 2b030ce97cd..116ff669a9c 100644
--- a/reactos/tools/rbuild/module.cpp
+++ b/reactos/tools/rbuild/module.cpp
@@ -1033,7 +1033,7 @@ Module::GetDefaultModuleEntrypoint () const
 	switch ( type )
 	{
 		case Kernel:
-			return "NtProcessStartup";
+			return "KiSystemStartup";
 		case KernelModeDLL:
 		case KernelModeDriver:
 			return "DriverEntry@8";