diff --git a/etc/rc.d/lockd b/etc/rc.d/lockd
index 9aa9d7fb892a..13a9891b5415 100644
--- a/etc/rc.d/lockd
+++ b/etc/rc.d/lockd
@@ -1,22 +1,28 @@
 #!/bin/sh
 #
 # $NetBSD: nfslocking,v 1.6 2002/03/24 15:52:41 lukem Exp $
+# FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm
 # $FreeBSD$
 #
 
-# PROVIDE: nfslocking
+# PROVIDE: lockd
 # REQUIRE: nfsserver nfsclient nfsd rpcbind
 # BEFORE:  DAEMON
 # KEYWORD: nojail
 
 . /etc/rc.subr
 
-# Save the (one) commandline argument in case it gets clobbered.
-arg=$1
+name="lockd"
+rcvar=rpc_lockd_enable
+command="/usr/sbin/rpc.${name}"
+start_precmd='lockd_precmd'
+stop_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable'
+status_precmd=$stop_precmd
 
-# Either NFS client or server must be enabled and rpcbind(8) must be started.
+# Make sure that we are either an NFS client or server, and that we get
+# the correct flags from rc.conf(5).
 #
-nfslocking_precmd()
+lockd_precmd()
 {
 	local ret
 	ret=0
diff --git a/etc/rc.d/statd b/etc/rc.d/statd
index fd2a78a1ee0e..aaf8bb404d89 100644
--- a/etc/rc.d/statd
+++ b/etc/rc.d/statd
@@ -1,22 +1,28 @@
 #!/bin/sh
 #
 # $NetBSD: nfslocking,v 1.6 2002/03/24 15:52:41 lukem Exp $
+# FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm Exp
 # $FreeBSD$
 #
 
-# PROVIDE: nfslocking
+# PROVIDE: statd
 # REQUIRE: nfsserver nfsclient nfsd rpcbind
 # BEFORE:  DAEMON
 # KEYWORD: nojail
 
 . /etc/rc.subr
 
-# Save the (one) commandline argument in case it gets clobbered.
-arg=$1
+name="statd"
+rcvar=rpc_statd_enable
+command="/usr/sbin/rpc.${name}"
+start_precmd='statd_precmd'
+stop_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable'
+status_precmd=$stop_precmd
 
-# Either NFS client or server must be enabled and rpcbind(8) must be started.
+# Make sure that we are either an NFS client or server, and that we get
+# the correct flags from rc.conf(5).
 #
-nfslocking_precmd()
+statd_precmd()
 {
 	local ret
 	ret=0