diff --git a/usr.sbin/chroot/chroot.8 b/usr.sbin/chroot/chroot.8
index 5edba3cb458a..3f2c9087a2bc 100644
--- a/usr.sbin/chroot/chroot.8
+++ b/usr.sbin/chroot/chroot.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)chroot.8	8.1 (Berkeley) 6/9/93
-.\"	$NetBSD: chroot.8,v 1.4 1997/06/22 08:26:10 lukem Exp $
+.\"	$NetBSD: chroot.8,v 1.5 1997/10/18 04:06:28 lukem Exp $
 .\"
 .Dd June 9, 1993
 .Dt CHROOT 8
@@ -39,7 +39,7 @@
 .Nm chroot
 .Nd change root directory
 .Sh SYNOPSIS
-.Nm chroot
+.Nm
 .Ar newroot
 .Op Ar command
 .Sh DESCRIPTION
@@ -56,7 +56,7 @@ Note,
 or the shell are run as your real-user-id.
 .Sh ENVIRONMENT
 The following environment variable is referenced by
-.Nm chroot :
+.Nm "" :
 .Bl -tag -width SHELL
 .It Ev SHELL
 If set,
diff --git a/usr.sbin/chroot/chroot.c b/usr.sbin/chroot/chroot.c
index caa8bdba6a63..8a2569d8ea18 100644
--- a/usr.sbin/chroot/chroot.c
+++ b/usr.sbin/chroot/chroot.c
@@ -31,15 +31,18 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1988, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
+__COPYRIGHT("@(#) Copyright (c) 1988, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n");
 #endif /* not lint */
 
 #ifndef lint
-/* static char sccsid[] = "@(#)chroot.c	8.1 (Berkeley) 6/9/93"; */
-static char rcsid[] = "$NetBSD: chroot.c,v 1.5 1997/03/06 07:00:52 mikel Exp $";
+#if 0
+static char sccsid[] = "@(#)chroot.c	8.1 (Berkeley) 6/9/93";
+#else
+__RCSID("$NetBSD: chroot.c,v 1.6 1997/10/18 04:06:32 lukem Exp $");
+#endif
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -52,7 +55,8 @@ static char rcsid[] = "$NetBSD: chroot.c,v 1.5 1997/03/06 07:00:52 mikel Exp $";
 #include <string.h>
 #include <unistd.h>
 
-void usage __P((void));
+int	main __P((int, char **));
+void	usage __P((void));
 
 int
 main(argc, argv)