diff --git a/kpasswd/kpasswdd.c b/kpasswd/kpasswdd.c
index 85f99714b..09a957450 100644
--- a/kpasswd/kpasswdd.c
+++ b/kpasswd/kpasswdd.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997-1999 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997-2000 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -457,8 +457,7 @@ out:
 }
 
 static int
-doit (krb5_keytab keytab,
-      int port)
+doit (krb5_keytab keytab, int port)
 {
     krb5_error_code ret;
     krb5_principal server;
@@ -622,10 +621,12 @@ main (int argc, char **argv)
 	sa.sa_handler = sigterm;
 	sigemptyset(&sa.sa_mask);
 
-	sigaction(SIGINT, &sa, NULL);
+	sigaction(SIGINT,  &sa, NULL);
+	sigaction(SIGTERM, &sa, NULL);
     }
 #else
-    signal(SIGINT, sigterm);
+    signal(SIGINT,  sigterm);
+    signal(SIGTERM, sigterm);
 #endif
 
     return doit (keytab,