diff --git a/kadmind.init b/kadmind.init
index 87f4702..6568559 100755
--- a/kadmind.init
+++ b/kadmind.init
@@ -9,6 +9,7 @@
 #              realm.
 # processname: kadmind
 # config: /etc/sysconfig/kadmin
+# pidfile: /var/run/kadmind.pid
 #
 
 ### BEGIN INIT INFO
@@ -34,6 +35,7 @@
 . /etc/init.d/functions
 prog="Kerberos 5 Admin Server"
 kadmind=/usr/sbin/kadmind
+pidfile=/var/run/kadmind.pid
 
 RETVAL=0
 
@@ -56,7 +58,7 @@ start() {
 	echo -n $"Starting $prog: "
 	# tell portreserve to release the kerberos-adm port
 	[ -x /sbin/portrelease ] && /sbin/portrelease kerberos-adm &>/dev/null || :
-	daemon ${kadmind} ${KRB5REALM:+-r ${KRB5REALM}} $KADMIND_ARGS
+	daemon ${kadmind} ${KRB5REALM:+-r ${KRB5REALM}} -P $pidfile $KADMIND_ARGS
 	RETVAL=$?
 	echo
 	if test $RETVAL -ne 0 ; then
diff --git a/krb5.spec b/krb5.spec
index 590ea70..92554e6 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -5,7 +5,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.8.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.8/krb5-1.8.2-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -625,6 +625,9 @@ exit 0
 %{_sbindir}/uuserver
 
 %changelog
+* Wed Jul  7 2010 Nalin Dahyabhai <nalin@redhat.com> 1.8.2-3
+- tell krb5kdc and kadmind to create pid files, since they can
+
 * Mon Jun 21 2010 Nalin Dahyabhai <nalin@redhat.com> 1.8.2-2
 - libgssapi: pull in patch from svn to stop returning context-expired errors
   when the ticket which was used to set up the context expires (#605366,
diff --git a/krb5kdc.init b/krb5kdc.init
index 5f641cc..363695d 100755
--- a/krb5kdc.init
+++ b/krb5kdc.init
@@ -8,6 +8,7 @@
 #	       clients need to connect to in order to obtain credentials.
 # processname: krb5kdc
 # config: /etc/sysconfig/krb5kdc
+# pidfile: /var/run/krb5kdc.pid
 #
 
 ### BEGIN INIT INFO
@@ -34,6 +35,7 @@
 RETVAL=0
 prog="Kerberos 5 KDC"
 krb5kdc=/usr/sbin/krb5kdc
+pidfile=/var/run/krb5kdc.pid
 
 # Shell functions to cut down on useless shell instances.
 start() {
@@ -41,7 +43,7 @@ start() {
 	echo -n $"Starting $prog: "
 	# tell portreserve to release the kerberos-iv port
 	[ -x /sbin/portrelease ] && /sbin/portrelease kerberos-iv &>/dev/null || :
-	daemon ${krb5kdc} ${KRB5REALM:+-r ${KRB5REALM}} $KRB5KDC_ARGS
+	daemon ${krb5kdc} ${KRB5REALM:+-r ${KRB5REALM}} -P $pidfile $KRB5KDC_ARGS
 	RETVAL=$?
 	echo
 	if test $RETVAL -ne 0 ; then