diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c
index 6c7d51ec3872..680925fc970a 100644
--- a/sbin/shutdown/shutdown.c
+++ b/sbin/shutdown/shutdown.c
@@ -39,10 +39,10 @@ static const char copyright[] =
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)shutdown.c	8.2 (Berkeley) 2/16/94";
+static char sccsid[] = "@(#)shutdown.c	8.4 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: shutdown.c,v 1.14 1998/12/10 23:54:02 msmith Exp $";
+	"$Id: shutdown.c,v 1.15 1998/12/11 11:04:19 bde Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -164,7 +164,7 @@ main(argc, argv)
 				break;
 			if (p != mbuf)
 				*p++ = ' ';
-			bcopy(*argv, p, arglen);
+			memmove(p, *argv, arglen);
 			p += arglen;
 		}
 		*p = '\n';
@@ -480,7 +480,8 @@ void
 finish(signo)
 	int signo;
 {
-	(void)unlink(_PATH_NOLOGIN);
+	if (!killflg)
+		(void)unlink(_PATH_NOLOGIN);
 	exit(0);
 }