diff --git a/src/etc/etc.amiga/MAKEDEV b/src/etc/etc.amiga/MAKEDEV
index 935bc54e..047c4fe9 100644
--- a/src/etc/etc.amiga/MAKEDEV
+++ b/src/etc/etc.amiga/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.25 1997/06/15 09:30:28 niklas Exp $
+#	$OpenBSD: MAKEDEV,v 1.26 1997/09/07 20:29:08 dgregor Exp $
 #	$NetBSD: MAKEDEV,v 1.21 1996/05/19 21:03:49 veego Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -489,7 +489,7 @@ pty*)
 		while [ $n -lt 16 ]
                 do
                         nam=$name`hex $n`
-                        rm -rf {tty,pty}$n
+                        rm -f {tty,pty}$nam
                         mknod tty$nam c 4 "$(( $offset + $n ))"
                         mknod pty$nam c 5 "$(( $offset + $n ))"
                         n="$(( $n + 1 ))"
diff --git a/src/etc/etc.arc/MAKEDEV b/src/etc/etc.arc/MAKEDEV
index c9cbb6af..28a5e76b 100644
--- a/src/etc/etc.arc/MAKEDEV
+++ b/src/etc/etc.arc/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.19 1997/05/21 18:30:50 pefo Exp $
+#	$OpenBSD: MAKEDEV,v 1.20 1997/09/07 20:29:09 dgregor Exp $
 #	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
 #
 
@@ -360,7 +360,7 @@ pty*)
 		while [ $n -lt 16 ]
 		do
 			nam=$name`hex $n`
-			rm -rf {tty,pty}$n
+			rm -f {tty,pty}$nam
 			mknod tty$nam c 4 "$(( $offset + $n ))"
 			mknod pty$nam c 5 "$(( $offset + $n ))"
 			n="$(( $n + 1 ))"
diff --git a/src/etc/etc.hp300/MAKEDEV b/src/etc/etc.hp300/MAKEDEV
index 54105a39..86a7ca3d 100644
--- a/src/etc/etc.hp300/MAKEDEV
+++ b/src/etc/etc.hp300/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.21 1997/07/14 04:27:54 downsj Exp $
+#	$OpenBSD: MAKEDEV,v 1.22 1997/09/07 20:29:10 dgregor Exp $
 #	$NetBSD: MAKEDEV,v 1.12 1995/11/05 23:50:22 thorpej Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -459,7 +459,7 @@ pty*)
 		while [ $n -lt 16 ]
 		do
 			nam=$name`hex $n`
-			rm -rf {tty,pty}$nam
+			rm -f {tty,pty}$nam
 			mknod tty$nam c 4 "$(( $offset + $n ))"
 			mknod pty$nam c 5 "$(( $offset + $n ))"
 			n="$(( $n + 1 ))"
diff --git a/src/etc/etc.i386/MAKEDEV b/src/etc/etc.i386/MAKEDEV
index 4ef62f05..5b7bf883 100644
--- a/src/etc/etc.i386/MAKEDEV
+++ b/src/etc/etc.i386/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.48 1997/08/06 07:06:46 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.49 1997/09/07 20:29:11 dgregor Exp $
 #	$NetBSD: MAKEDEV,v 1.40 1996/03/31 00:50:47 perry Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -380,7 +380,7 @@ pty*)
 		while [ $n -lt 16 ]
                 do
                         nam=$name`hex $n`
-                        rm -rf {tty,pty}$nam
+                        rm -f {tty,pty}$nam
                         mknod tty$nam c 5 "$(( $offset + $n ))"
                         mknod pty$nam c 6 "$(( $offset + $n ))"
                         n="$(( $n + 1 ))"
diff --git a/src/etc/etc.mac68k/MAKEDEV b/src/etc/etc.mac68k/MAKEDEV
index 7d7ef0bd..03b57da3 100644
--- a/src/etc/etc.mac68k/MAKEDEV
+++ b/src/etc/etc.mac68k/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.16 1997/06/10 00:01:31 gene Exp $
+#	$OpenBSD: MAKEDEV,v 1.17 1997/09/07 20:29:12 dgregor Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -244,7 +244,7 @@ pty*)
 		while [ $n -lt 16 ]
 		do
 			nam=$name`hex $n`
-			rm -rf {tty,pty}$n
+			rm -f {tty,pty}$nam
 			mknod tty$nam c 4 `add $offset $n`
 			mknod pty$nam c 5 `add $offset $n`
 			n=`add $n 1`
diff --git a/src/etc/etc.pmax/MAKEDEV b/src/etc/etc.pmax/MAKEDEV
index eeafc426..bf1002e7 100644
--- a/src/etc/etc.pmax/MAKEDEV
+++ b/src/etc/etc.pmax/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.18 1997/09/07 20:01:16 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.19 1997/09/07 20:29:13 dgregor Exp $
 #	@(#)MAKEDEV	8.1 (Berkeley) 6/9/93
 #
 
@@ -247,7 +247,7 @@ pty*)
 		while [ $n -lt 16 ]
 		do
 			nam=$name`hex $n`
-			rm -rf {tty,pty}$n
+			rm -f {tty,pty}$nam
 			mknod tty$nam c 4 "$(( $offset + $n ))"
 			mknod pty$nam c 5 "$(( $offset + $n ))"
 			n="$(( $n + 1 ))"
diff --git a/src/etc/etc.powerpc/MAKEDEV b/src/etc/etc.powerpc/MAKEDEV
index a89f7ddb..aa77764e 100644
--- a/src/etc/etc.powerpc/MAKEDEV
+++ b/src/etc/etc.powerpc/MAKEDEV
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#       $OpenBSD: MAKEDEV,v 1.10 1997/05/14 15:41:20 niklas Exp $
+#       $OpenBSD: MAKEDEV,v 1.11 1997/09/07 20:29:14 dgregor Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -273,7 +273,7 @@ pty*)
 		while [ $n -lt 16 ]
 		do
 			nam=$name`hex $n`
-			rm -rf {tty,pty}$n
+			rm -f {tty,pty}$nam
 			mknod tty$nam c 4 "$(( $offset + $n ))"
 			mknod pty$nam c 5 "$(( $offset + $n ))"
 			n="$(( $n + 1 ))"
diff --git a/src/etc/etc.sparc/MAKEDEV b/src/etc/etc.sparc/MAKEDEV
index c5f73405..13542b6c 100644
--- a/src/etc/etc.sparc/MAKEDEV
+++ b/src/etc/etc.sparc/MAKEDEV
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: MAKEDEV,v 1.31 1997/08/24 22:44:08 deraadt Exp $
+#	$OpenBSD: MAKEDEV,v 1.32 1997/09/07 20:29:15 dgregor Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -485,7 +485,7 @@ pty*)
 		while [ $n -lt 16 ]
                 do
                         nam=$name`hex $n`
-                        rm -rf {tty,pty}$n
+                        rm -f {tty,pty}$nam
                         mknod tty$nam c 20 `add $offset $n`
                         mknod pty$nam c 21 `add $offset $n`
                         n=`add $n 1`