diff --git a/sbin/clri/clri.8 b/sbin/clri/clri.8
index 47e789b430c0..00674984c720 100644
--- a/sbin/clri/clri.8
+++ b/sbin/clri/clri.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: clri.8,v 1.3 1997/07/11 07:48:30 mikel Exp $
+.\"	$NetBSD: clri.8,v 1.4 1997/09/14 08:44:07 lukem Exp $
 .\"
 .\" Copyright (c) 1980, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -40,23 +40,23 @@
 .Nm clri
 .Nd clear an inode
 .Sh SYNOPSIS
-.Nm clri
+.Nm
 .Ar special_device inode_number ...
 .Sh DESCRIPTION
 .Bf -symbolic
-.Nm Clri
+.Nm
 is obsoleted for normal file system repair work by
 .Xr fsck 8 .
 .Ef
 .Pp
-.Nm Clri
+.Nm
 zeros out the inodes with the specified inode number(s)
 on the filesystem residing on the given
 .Ar special_device .
 The
 .Xr fsck 8
 utility is usually run after
-.Nm clri
+.Nm
 to reclaim the zero'ed inode(s) and the
 blocks previously claimed by those inode(s).
 Both read and write permission are required on the specified
@@ -75,5 +75,5 @@ will be able to clean up the resulting mess.
 .Xr fsdb 8
 .Sh BUGS
 If the file is open, the work of
-.Nm clri
+.Nm
 will be lost when the inode is written back to disk from the inode cache.
diff --git a/sbin/clri/clri.c b/sbin/clri/clri.c
index 025409d86f06..c75dbd6fd30a 100644
--- a/sbin/clri/clri.c
+++ b/sbin/clri/clri.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: clri.c,v 1.9 1995/03/18 14:54:33 cgd Exp $	*/
+/*	$NetBSD: clri.c,v 1.10 1997/09/14 08:44:09 lukem Exp $	*/
 
 /*
  * Copyright (c) 1990, 1993
@@ -36,17 +36,17 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1990, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
+__COPYRIGHT("@(#) Copyright (c) 1990, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n");
 #endif /* not lint */
 
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)clri.c	8.2 (Berkeley) 9/23/93";
 #else
-static char rcsid[] = "$NetBSD: clri.c,v 1.9 1995/03/18 14:54:33 cgd Exp $";
+__RCSID("$NetBSD: clri.c,v 1.10 1997/09/14 08:44:09 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -64,14 +64,16 @@ static char rcsid[] = "$NetBSD: clri.c,v 1.9 1995/03/18 14:54:33 cgd Exp $";
 #include <stdio.h>
 #include <unistd.h>
 
+int	main __P((int, char *[]));
+
 int
 main(argc, argv)
 	int argc;
 	char *argv[];
 {
-	register struct fs *sbp;
-	register struct dinode *ip;
-	register int fd;
+	struct fs *sbp;
+	struct dinode *ip;
+	int fd;
 	struct dinode ibuf[MAXBSIZE / sizeof (struct dinode)];
 	int32_t generation;
 	off_t offset;