diff --git a/usr.bin/chflags/chflags.1 b/usr.bin/chflags/chflags.1
index 23dfffe65009..2dc23ec07c50 100644
--- a/usr.bin/chflags/chflags.1
+++ b/usr.bin/chflags/chflags.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: chflags.1,v 1.3 1995/01/04 05:40:08 mycroft Exp $
+.\"	$NetBSD: chflags.1,v 1.4 1995/08/31 22:50:22 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -34,9 +34,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	@(#)chflags.1	8.2 (Berkeley) 3/31/94
+.\"	@(#)chflags.1	8.4 (Berkeley) 5/2/95
 .\"
-.Dd March 31, 1994
+.Dd May 2, 1995
 .Dt CHFLAGS 1
 .Os
 .Sh NAME
@@ -82,7 +82,8 @@ Flags are a comma separated list of keywords.
 The following keywords are currently defined:
 .Bd -literal -offset indent compact
 arch	set the archived flag
-dump	set the dump flag
+opaque	set the opaque flag (owner or super-user only)
+nodump	set the nodump flag (owner or super-user only)
 sappnd	set the system append-only flag (super-user only)
 schg	set the system immutable flag (super-user only)
 uappnd	set the user append-only flag (owner or super-user only)
@@ -94,7 +95,7 @@ Putting the letters
 before an option causes the flag to be turned off.
 For example:
 .Bd -literal -offset indent compact
-nodump	the file should never be dumped
+nouchg	the immutable bit should be cleared
 .Ed
 .Pp
 Symbolic links do not have flags, so unless the
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index 547ec1b720bd..0e868d388770 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -38,8 +38,10 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)kdump.c	8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: kdump.c,v 1.11 1995/07/19 15:11:28 christos Exp $";
+#if 0
+static char sccsid[] = "@(#)kdump.c	8.4 (Berkeley) 4/28/95";
+#endif
+static char *rcsid = "$NetBSD: kdump.c,v 1.12 1995/08/31 23:18:33 jtc Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -314,7 +316,8 @@ ktrsyscall(ktr)
 				ap++;
 				argsize -= sizeof(register_t);
 			} else if (ktr->ktr_code == SYS_ptrace) {
-				if (*ap <=sizeof(ptrace_ops)/sizeof(ptrace_ops[0]) && *ap >= 0)
+				if (*ap >= 0 && *ap <=
+				    sizeof(ptrace_ops) / sizeof(ptrace_ops[0]))
 					(void)printf("(%s", ptrace_ops[*ap]);
 				else
 					(void)printf("(%ld", (long)*ap);
diff --git a/usr.bin/kdump/mkioctls b/usr.bin/kdump/mkioctls
index 99052fb17ec4..74b12f40191b 100644
--- a/usr.bin/kdump/mkioctls
+++ b/usr.bin/kdump/mkioctls
@@ -1,4 +1,37 @@
-#	$Id: mkioctls,v 1.6 1995/06/06 23:45:27 thorpej Exp $
+#!/bin/sh -
+#
+# Copyright (c) 1994
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#	@(#)mkioctls	8.2 (Berkeley) 4/28/95
 #
 cpp -dM ${1+"$@"} | awk '
 BEGIN {
diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c
index 2ee87954b995..f0de4fbe2164 100644
--- a/usr.bin/ktrace/ktrace.c
+++ b/usr.bin/ktrace/ktrace.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: ktrace.c,v 1.4 1995/08/31 23:01:44 jtc Exp $	*/
+
 /*-
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -38,8 +40,10 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)ktrace.c	8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: ktrace.c,v 1.3 1995/01/03 07:04:18 glass Exp $";
+#if 0
+static char sccsid[] = "@(#)ktrace.c	8.2 (Berkeley) 4/28/95";
+#endif
+static char *rcsid = "$NetBSD: ktrace.c,v 1.4 1995/08/31 23:01:44 jtc Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c
index 42dcef3148e2..5f0ded7d7dac 100644
--- a/usr.bin/ktrace/subr.c
+++ b/usr.bin/ktrace/subr.c
@@ -1,3 +1,5 @@
+/*	$NetBSD: subr.c,v 1.6 1995/08/31 23:01:45 jtc Exp $	*/
+
 /*-
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -32,8 +34,10 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)subr.c	8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: subr.c,v 1.5 1995/07/19 15:14:08 christos Exp $";
+#if 0
+static char sccsid[] = "@(#)subr.c	8.2 (Berkeley) 4/28/95";
+#endif
+static char *rcsid = "$NetBSD: subr.c,v 1.6 1995/08/31 23:01:45 jtc Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/login/login.1 b/usr.bin/login/login.1
index 830c44abb9ed..30c250a761cb 100644
--- a/usr.bin/login/login.1
+++ b/usr.bin/login/login.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: login.1,v 1.6 1995/07/25 18:18:56 jtc Exp $
+.\"	$NetBSD: login.1,v 1.7 1995/08/31 22:52:33 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -31,9 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	@(#)login.1	8.1 (Berkeley) 6/9/93
+.\"	@(#)login.1	8.2 (Berkeley) 5/5/94
 .\"
-.Dd June 9, 1993
+.Dd May 5, 1994
 .Dt LOGIN 1
 .Os BSD 4
 .Sh NAME
@@ -131,6 +131,8 @@ message-of-the-day
 disallows logins
 .It Pa /var/run/utmp
 current logins
+.It Pa /var/log/lastlog
+last login account records
 .It Pa /var/log/wtmp
 login account records
 .It Pa /var/mail/user