diff --git a/kdc/main.c b/kdc/main.c
index b966394f7..2f72fd8be 100644
--- a/kdc/main.c
+++ b/kdc/main.c
@@ -94,6 +94,7 @@ main(int argc, char **argv)
     signal(SIGINT, sigterm);
     signal(SIGTERM, sigterm);
 #endif
+    pidfile(NULL);
     loop();
     krb5_free_context(context);
     return 0;
diff --git a/kpasswd/kpasswdd.c b/kpasswd/kpasswdd.c
index 5c3e0eba7..271d3b96d 100644
--- a/kpasswd/kpasswdd.c
+++ b/kpasswd/kpasswdd.c
@@ -35,9 +35,6 @@
 RCSID("$Id$");
 
 #include <kadm5/admin.h>
-#ifdef HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
 
 #include <hdb.h>
 
@@ -575,6 +572,8 @@ main (int argc, char **argv)
     signal(SIGTERM, sigterm);
 #endif
 
+    pidfile(NULL);
+
     return doit (keytab,
 		 krb5_getportbyname (context, "kpasswd", 
 				     "udp", KPASSWD_PORT));