diff --git a/scheduler/process.c b/scheduler/process.c
index 2ffe57dec7ccb0eea2a10035f0e8e513f44b7876..aa460cd4f8d3825e01d00e01f2ed23726617de09 100644
--- a/scheduler/process.c
+++ b/scheduler/process.c
@@ -636,7 +636,9 @@ void WINAPI ExitProcess( DWORD status )
     req->handle    = GetCurrentProcess();
     req->exit_code = status;
     server_call( REQ_TERMINATE_PROCESS );
-    exit( status );
+    /* FIXME: need separate address spaces for that */
+    /* exit( status ); */
+    SYSDEPS_ExitThread( status );
 }
 
 /***********************************************************************