diff --git a/etc/rc.d/nfslocking b/etc/rc.d/nfslocking
index 3c78c84b5ff6..9f9258ec423d 100755
--- a/etc/rc.d/nfslocking
+++ b/etc/rc.d/nfslocking
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: nfslocking,v 1.5 2002/03/22 04:33:59 thorpej Exp $
+# $NetBSD: nfslocking,v 1.6 2002/03/24 15:52:41 lukem Exp $
 #
 
 # PROVIDE: nfslocking
@@ -11,7 +11,8 @@
 
 arg=$1
 
-start_precmd='checkyesno nfs_server || checkyesno nfs_client'
+start_precmd='checkyesno nfs_server || checkyesno nfs_client ||
+		[ -n "$rc_force" ]'
 stop_precmd=$start_precmd
 status_precmd=$start_precmd
 
diff --git a/etc/rc.d/swap1 b/etc/rc.d/swap1
index a7dbf887acd5..7eb80a4e1d5a 100755
--- a/etc/rc.d/swap1
+++ b/etc/rc.d/swap1
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: swap1,v 1.7 2002/03/21 23:08:36 lukem Exp $
+# $NetBSD: swap1,v 1.8 2002/03/24 15:52:41 lukem Exp $
 #
 
 # PROVIDE: localswap
@@ -27,7 +27,7 @@ swap1_start()
 #
 swap1_stop()
 {
-	if checkyesno swapoff; then
+	if checkyesno swapoff || [ -n "$rc_force" ]; then
 		echo "Removing block-type swap devices"
 		swapctl -U -t blk
 	fi