diff --git a/udev.c b/udev.c
index 192bed97d8..eb21f75461 100644
--- a/udev.c
+++ b/udev.c
@@ -55,7 +55,7 @@ void log_message(int level, const char *format, ...)
 }
 #endif
 
-static void sig_handler(int signum)
+__attribute__((regparm(0))) static void sig_handler(int signum)
 {
 	switch (signum) {
 		case SIGINT:
@@ -63,7 +63,7 @@ static void sig_handler(int signum)
 			udevdb_exit();
 			exit(20 + signum);
 		default:
-			dbg("unhandled signal");
+			dbg("unhandled signal %d", signum);
 	}
 }
 
@@ -128,7 +128,7 @@ static int udev_hotplug(void)
 		goto exit;
 	}
 
-	/* set up a default signal handler for now */
+	/* set signal handlers */
 	act.sa_handler = sig_handler;
 	sigemptyset (&act.sa_mask);
 	act.sa_flags = SA_RESTART;
diff --git a/udevd.c b/udevd.c
index 5756b46122..e0c5bf5c77 100644
--- a/udevd.c
+++ b/udevd.c
@@ -306,9 +306,10 @@ skip:
 	return;
 }
 
-static void sig_handler(int signum)
+__attribute__((regparm(0))) static void sig_handler(int signum)
 {
 	int rc;
+
 	switch (signum) {
 		case SIGINT:
 		case SIGTERM:
@@ -325,7 +326,7 @@ static void sig_handler(int signum)
 			goto do_write;
 			break;
 		default:
-			dbg("unhandled signal");
+			dbg("unhandled signal %d", signum);
 			return;
 	}