diff --git a/src/d_main.c b/src/d_main.c
index 467976c1..e3252e88 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -613,9 +613,6 @@ void D_SRB2Loop(void)
 
 	// Pushing of + parameters is now done back in D_SRB2Main, not here.
 
-	CONS_Printf("I_StartupKeyboard()...\n");
-	I_StartupKeyboard();
-
 #ifdef _WINDOWS
 	CONS_Printf("I_StartupMouse()...\n");
 	I_DoStartupMouse();
diff --git a/src/i_system.h b/src/i_system.h
index d1708fe5..3e589c69 100644
--- a/src/i_system.h
+++ b/src/i_system.h
@@ -226,10 +226,6 @@ void I_StartupMouse(void);
 */
 void I_StartupMouse2(void);
 
-/**	\brief keyboard startup, shutdown, handler
-*/
-void I_StartupKeyboard(void);
-
 /**	\brief  setup timer irq and user timer routine.
 */
 void I_StartupTimer(void);
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index aa74d7d9..d8404e24 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -692,7 +692,7 @@ static inline void I_ShutdownConsole(void){}
 //
 // StartupKeyboard
 //
-void I_StartupKeyboard (void)
+void I_RegisterSignals (void)
 {
 #ifdef SIGINT
 	signal(SIGINT , quit_handler);
@@ -3111,6 +3111,7 @@ INT32 I_StartupSystem(void)
 #ifdef NEWSIGNALHANDLER
 	I_Fork();
 #endif
+	I_RegisterSignals();
 	I_OutputMsg("Compiled for SDL version: %d.%d.%d\n",
 	 SDLcompiled.major, SDLcompiled.minor, SDLcompiled.patch);
 	I_OutputMsg("Linked with SDL version: %d.%d.%d\n",