diff --git a/hurd/hurdfault.c b/hurd/hurdfault.c
index 4340897dee..dae889a93a 100644
--- a/hurd/hurdfault.c
+++ b/hurd/hurdfault.c
@@ -205,8 +205,8 @@ _hurdsig_fault_init (void)
      It runs the function above.  */
   memset (&state, 0, sizeof state);
   MACHINE_THREAD_STATE_FIX_NEW (&state);
-  MACHINE_THREAD_STATE_SET_PC (&state, faulted);
-  MACHINE_THREAD_STATE_SET_SP (&state, faultstack, sizeof faultstack);
+  MACHINE_THREAD_STATE_SETUP_CALL (&state, faultstack,
+				   sizeof faultstack, faulted);
 
   err = __USEPORT
     (PROC,