From 2a4562393f80633b81c11d4f7df00548d1cc3c48 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Fri, 27 Aug 1999 23:15:48 +0000
Subject: [PATCH] $Id$ -> $FreeBSD$

---
 bin/Makefile                  | 2 +-
 bin/Makefile.inc              | 2 +-
 bin/cat/Makefile              | 2 +-
 bin/cat/cat.1                 | 2 +-
 bin/cat/cat.c                 | 2 +-
 bin/chio/Makefile             | 2 +-
 bin/chio/chio.1               | 2 +-
 bin/chio/chio.c               | 2 +-
 bin/chio/defs.h               | 2 +-
 bin/chio/pathnames.h          | 2 +-
 bin/chmod/Makefile            | 2 +-
 bin/chmod/chmod.1             | 2 +-
 bin/chmod/chmod.c             | 2 +-
 bin/cp/Makefile               | 2 +-
 bin/cp/cp.1                   | 2 +-
 bin/cp/cp.c                   | 2 +-
 bin/cp/extern.h               | 2 +-
 bin/cp/utils.c                | 2 +-
 bin/csh/Makefile              | 2 +-
 bin/csh/USD.doc/Makefile      | 2 +-
 bin/csh/USD.doc/csh.1         | 2 +-
 bin/csh/USD.doc/csh.2         | 2 +-
 bin/csh/USD.doc/csh.3         | 2 +-
 bin/csh/USD.doc/csh.4         | 2 +-
 bin/csh/USD.doc/csh.a         | 2 +-
 bin/csh/USD.doc/csh.g         | 2 +-
 bin/csh/USD.doc/tabs          | 2 +-
 bin/csh/alloc.c               | 2 +-
 bin/csh/char.c                | 2 +-
 bin/csh/char.h                | 2 +-
 bin/csh/const.c               | 2 +-
 bin/csh/csh.1                 | 2 +-
 bin/csh/csh.c                 | 2 +-
 bin/csh/csh.h                 | 2 +-
 bin/csh/dir.c                 | 2 +-
 bin/csh/dir.h                 | 2 +-
 bin/csh/dol.c                 | 2 +-
 bin/csh/err.c                 | 2 +-
 bin/csh/exec.c                | 2 +-
 bin/csh/exp.c                 | 2 +-
 bin/csh/extern.h              | 2 +-
 bin/csh/file.c                | 2 +-
 bin/csh/func.c                | 2 +-
 bin/csh/glob.c                | 2 +-
 bin/csh/hist.c                | 2 +-
 bin/csh/init.c                | 2 +-
 bin/csh/lex.c                 | 2 +-
 bin/csh/misc.c                | 2 +-
 bin/csh/parse.c               | 2 +-
 bin/csh/pathnames.h           | 2 +-
 bin/csh/proc.c                | 2 +-
 bin/csh/proc.h                | 2 +-
 bin/csh/sem.c                 | 2 +-
 bin/csh/set.c                 | 2 +-
 bin/csh/str.c                 | 2 +-
 bin/csh/time.c                | 2 +-
 bin/date/Makefile             | 2 +-
 bin/date/date.1               | 2 +-
 bin/date/date.c               | 2 +-
 bin/date/extern.h             | 2 +-
 bin/date/netdate.c            | 2 +-
 bin/date/vary.c               | 2 +-
 bin/date/vary.h               | 2 +-
 bin/dd/Makefile               | 2 +-
 bin/dd/args.c                 | 2 +-
 bin/dd/conv.c                 | 2 +-
 bin/dd/conv_tab.c             | 2 +-
 bin/dd/dd.1                   | 2 +-
 bin/dd/dd.c                   | 2 +-
 bin/dd/dd.h                   | 2 +-
 bin/dd/extern.h               | 2 +-
 bin/dd/misc.c                 | 2 +-
 bin/dd/position.c             | 2 +-
 bin/df/Makefile               | 2 +-
 bin/df/df.1                   | 2 +-
 bin/df/df.c                   | 2 +-
 bin/domainname/Makefile       | 2 +-
 bin/domainname/domainname.1   | 2 +-
 bin/domainname/domainname.c   | 2 +-
 bin/echo/Makefile             | 2 +-
 bin/echo/echo.1               | 2 +-
 bin/echo/echo.c               | 2 +-
 bin/ed/Makefile               | 2 +-
 bin/ed/POSIX                  | 2 +-
 bin/ed/README                 | 2 +-
 bin/ed/buf.c                  | 2 +-
 bin/ed/cbc.c                  | 2 +-
 bin/ed/ed.1                   | 2 +-
 bin/ed/ed.h                   | 2 +-
 bin/ed/glbl.c                 | 2 +-
 bin/ed/io.c                   | 2 +-
 bin/ed/main.c                 | 2 +-
 bin/ed/re.c                   | 2 +-
 bin/ed/sub.c                  | 2 +-
 bin/ed/test/Makefile          | 2 +-
 bin/ed/test/README            | 2 +-
 bin/ed/test/ckscripts.sh      | 2 +-
 bin/ed/test/mkscripts.sh      | 2 +-
 bin/ed/undo.c                 | 2 +-
 bin/expr/Makefile             | 2 +-
 bin/expr/expr.1               | 2 +-
 bin/expr/expr.y               | 2 +-
 bin/hostname/Makefile         | 2 +-
 bin/hostname/hostname.1       | 2 +-
 bin/hostname/hostname.c       | 2 +-
 bin/kill/Makefile             | 2 +-
 bin/kill/kill.1               | 2 +-
 bin/kill/kill.c               | 2 +-
 bin/ln/Makefile               | 2 +-
 bin/ln/ln.1                   | 2 +-
 bin/ln/ln.c                   | 2 +-
 bin/ln/symlink.7              | 2 +-
 bin/ls/Makefile               | 2 +-
 bin/ls/cmp.c                  | 2 +-
 bin/ls/extern.h               | 2 +-
 bin/ls/ls.1                   | 2 +-
 bin/ls/ls.c                   | 2 +-
 bin/ls/ls.h                   | 2 +-
 bin/ls/print.c                | 2 +-
 bin/ls/stat_flags.c           | 2 +-
 bin/ls/util.c                 | 2 +-
 bin/mkdir/Makefile            | 2 +-
 bin/mkdir/mkdir.1             | 2 +-
 bin/mkdir/mkdir.c             | 2 +-
 bin/mv/Makefile               | 2 +-
 bin/mv/mv.1                   | 2 +-
 bin/mv/mv.c                   | 2 +-
 bin/mv/pathnames.h            | 2 +-
 bin/pax/Makefile              | 2 +-
 bin/pax/ar_io.c               | 2 +-
 bin/pax/ar_subs.c             | 2 +-
 bin/pax/buf_subs.c            | 2 +-
 bin/pax/cache.c               | 2 +-
 bin/pax/cache.h               | 2 +-
 bin/pax/cpio.c                | 2 +-
 bin/pax/cpio.h                | 2 +-
 bin/pax/extern.h              | 2 +-
 bin/pax/file_subs.c           | 2 +-
 bin/pax/ftree.c               | 2 +-
 bin/pax/ftree.h               | 2 +-
 bin/pax/gen_subs.c            | 2 +-
 bin/pax/options.c             | 2 +-
 bin/pax/options.h             | 2 +-
 bin/pax/pat_rep.c             | 2 +-
 bin/pax/pat_rep.h             | 2 +-
 bin/pax/pax.1                 | 2 +-
 bin/pax/pax.c                 | 2 +-
 bin/pax/pax.h                 | 2 +-
 bin/pax/sel_subs.c            | 2 +-
 bin/pax/sel_subs.h            | 2 +-
 bin/pax/tables.c              | 2 +-
 bin/pax/tables.h              | 2 +-
 bin/pax/tar.c                 | 2 +-
 bin/pax/tar.h                 | 2 +-
 bin/pax/tty_subs.c            | 2 +-
 bin/ps/Makefile               | 2 +-
 bin/ps/extern.h               | 2 +-
 bin/ps/fmt.c                  | 2 +-
 bin/ps/keyword.c              | 2 +-
 bin/ps/print.c                | 2 +-
 bin/ps/ps.1                   | 2 +-
 bin/ps/ps.c                   | 2 +-
 bin/ps/ps.h                   | 2 +-
 bin/pwd/Makefile              | 2 +-
 bin/pwd/pwd.1                 | 2 +-
 bin/pwd/pwd.c                 | 2 +-
 bin/rcp/Makefile              | 2 +-
 bin/rcp/extern.h              | 2 +-
 bin/rcp/pathnames.h           | 2 +-
 bin/rcp/rcp.1                 | 2 +-
 bin/rcp/rcp.c                 | 2 +-
 bin/rcp/util.c                | 2 +-
 bin/rm/Makefile               | 2 +-
 bin/rm/rm.1                   | 2 +-
 bin/rm/rm.c                   | 2 +-
 bin/rmail/Makefile            | 2 +-
 bin/rmdir/Makefile            | 2 +-
 bin/rmdir/rmdir.1             | 2 +-
 bin/rmdir/rmdir.c             | 2 +-
 bin/sh/Makefile               | 2 +-
 bin/sh/TOUR                   | 2 +-
 bin/sh/alias.c                | 2 +-
 bin/sh/alias.h                | 2 +-
 bin/sh/arith.h                | 2 +-
 bin/sh/arith.y                | 4 ++--
 bin/sh/arith_lex.l            | 4 ++--
 bin/sh/bltin/bltin.h          | 2 +-
 bin/sh/bltin/echo.1           | 2 +-
 bin/sh/bltin/echo.c           | 2 +-
 bin/sh/builtins.def           | 2 +-
 bin/sh/cd.c                   | 2 +-
 bin/sh/cd.h                   | 2 +-
 bin/sh/error.c                | 2 +-
 bin/sh/error.h                | 2 +-
 bin/sh/eval.c                 | 2 +-
 bin/sh/eval.h                 | 2 +-
 bin/sh/exec.c                 | 2 +-
 bin/sh/exec.h                 | 2 +-
 bin/sh/expand.c               | 2 +-
 bin/sh/expand.h               | 2 +-
 bin/sh/funcs/cmv              | 2 +-
 bin/sh/funcs/dirs             | 2 +-
 bin/sh/funcs/kill             | 2 +-
 bin/sh/funcs/login            | 2 +-
 bin/sh/funcs/newgrp           | 2 +-
 bin/sh/funcs/popd             | 2 +-
 bin/sh/funcs/pushd            | 2 +-
 bin/sh/funcs/suspend          | 2 +-
 bin/sh/histedit.c             | 2 +-
 bin/sh/init.h                 | 2 +-
 bin/sh/input.c                | 2 +-
 bin/sh/input.h                | 2 +-
 bin/sh/jobs.c                 | 2 +-
 bin/sh/jobs.h                 | 2 +-
 bin/sh/machdep.h              | 2 +-
 bin/sh/mail.c                 | 2 +-
 bin/sh/mail.h                 | 2 +-
 bin/sh/main.c                 | 2 +-
 bin/sh/main.h                 | 2 +-
 bin/sh/memalloc.c             | 2 +-
 bin/sh/memalloc.h             | 2 +-
 bin/sh/miscbltin.c            | 2 +-
 bin/sh/mkbuiltins             | 2 +-
 bin/sh/mkinit.c               | 2 +-
 bin/sh/mknodes.c              | 2 +-
 bin/sh/mksyntax.c             | 2 +-
 bin/sh/mktokens               | 2 +-
 bin/sh/myhistedit.h           | 2 +-
 bin/sh/mystring.c             | 2 +-
 bin/sh/mystring.h             | 2 +-
 bin/sh/nodes.c.pat            | 2 +-
 bin/sh/nodetypes              | 2 +-
 bin/sh/options.c              | 2 +-
 bin/sh/options.h              | 2 +-
 bin/sh/output.c               | 2 +-
 bin/sh/output.h               | 2 +-
 bin/sh/parser.c               | 2 +-
 bin/sh/parser.h               | 2 +-
 bin/sh/redir.c                | 2 +-
 bin/sh/redir.h                | 2 +-
 bin/sh/sh.1                   | 2 +-
 bin/sh/shell.h                | 2 +-
 bin/sh/show.c                 | 2 +-
 bin/sh/show.h                 | 2 +-
 bin/sh/trap.c                 | 2 +-
 bin/sh/trap.h                 | 2 +-
 bin/sh/var.c                  | 2 +-
 bin/sh/var.h                  | 2 +-
 bin/sleep/Makefile            | 2 +-
 bin/sleep/sleep.1             | 2 +-
 bin/sleep/sleep.c             | 2 +-
 bin/stty/Makefile             | 2 +-
 bin/stty/cchar.c              | 2 +-
 bin/stty/extern.h             | 2 +-
 bin/stty/gfmt.c               | 2 +-
 bin/stty/key.c                | 2 +-
 bin/stty/modes.c              | 2 +-
 bin/stty/print.c              | 2 +-
 bin/stty/stty.1               | 2 +-
 bin/stty/stty.c               | 2 +-
 bin/stty/stty.h               | 2 +-
 bin/stty/util.c               | 2 +-
 bin/sync/Makefile             | 2 +-
 bin/sync/sync.8               | 2 +-
 bin/sync/sync.c               | 2 +-
 bin/test/Makefile             | 2 +-
 bin/test/TEST.README          | 2 +-
 bin/test/TEST.csh             | 2 +-
 bin/test/TEST.sh              | 2 +-
 bin/test/test.1               | 2 +-
 bin/test/test.c               | 2 +-
 lib/libc/gen/setflags.c       | 2 +-
 lib/libc/gen/setflagsbyname.c | 2 +-
 lib/libc/gen/strtofflags.c    | 2 +-
 lib/libutil/stat_flags.c      | 2 +-
 275 files changed, 277 insertions(+), 277 deletions(-)

diff --git a/bin/Makefile b/bin/Makefile
index 32b5d7381744..c78bf08d8cf4 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.13 1998/08/15 12:27:23 jb Exp $
+# $FreeBSD$
 
 SUBDIR= cat \
 	chio \
diff --git a/bin/Makefile.inc b/bin/Makefile.inc
index 0c085ca286aa..d29f43ab50c7 100644
--- a/bin/Makefile.inc
+++ b/bin/Makefile.inc
@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile.inc,v 1.9 1997/02/22 14:01:23 peter Exp $
+# $FreeBSD$
 
 BINDIR?=	/bin
 CFLAGS+=	-Wall -Wformat
diff --git a/bin/cat/Makefile b/bin/cat/Makefile
index 6da43b3828af..672a4eeeeff5 100644
--- a/bin/cat/Makefile
+++ b/bin/cat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	cat
 
diff --git a/bin/cat/cat.1 b/bin/cat/cat.1
index f6b4a22d2917..ce684fd94ad8 100644
--- a/bin/cat/cat.1
+++ b/bin/cat/cat.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cat.1	8.3 (Berkeley) 5/2/95
-.\"	$Id: cat.1,v 1.8 1998/05/13 07:16:36 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 2, 1995
 .Dt CAT 1
diff --git a/bin/cat/cat.c b/bin/cat/cat.c
index 544fba56d182..f88c125ff316 100644
--- a/bin/cat/cat.c
+++ b/bin/cat/cat.c
@@ -45,7 +45,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)cat.c	8.2 (Berkeley) 4/27/95";
 #endif
 static const char rcsid[] =
-	"$Id: cat.c,v 1.12 1998/09/11 05:48:06 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/chio/Makefile b/bin/chio/Makefile
index 70c8bee11e2e..d4b7f56e3c97 100644
--- a/bin/chio/Makefile
+++ b/bin/chio/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1999/06/07 13:53:56 kris Exp $
+# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 CFLAGS+=-I${.CURDIR}/../../sys
diff --git a/bin/chio/chio.1 b/bin/chio/chio.1
index 344b58747feb..34f913f4287d 100644
--- a/bin/chio/chio.1
+++ b/bin/chio/chio.1
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: chio.1,v 1.8 1998/11/30 23:05:38 billf Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 14, 1998
 .Dt CHIO 1
diff --git a/bin/chio/chio.c b/bin/chio/chio.c
index f79becf62f9e..c7ee34429f27 100644
--- a/bin/chio/chio.c
+++ b/bin/chio/chio.c
@@ -38,7 +38,7 @@
 static const char copyright[] =
 	"@(#) Copyright (c) 1996 Jason R. Thorpe.  All rights reserved.";
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/chio/defs.h b/bin/chio/defs.h
index 5bab57e766ff..f4580a54b586 100644
--- a/bin/chio/defs.h
+++ b/bin/chio/defs.h
@@ -1,4 +1,4 @@
-/*	$Id: $	*/
+/* $FreeBSD$	*/
 
 /*
  * Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
diff --git a/bin/chio/pathnames.h b/bin/chio/pathnames.h
index cdd67fa2c44e..9a9b74a54815 100644
--- a/bin/chio/pathnames.h
+++ b/bin/chio/pathnames.h
@@ -1,4 +1,4 @@
-/*	$Id: $	*/
+/* $FreeBSD$	*/
 
 /*
  * Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
diff --git a/bin/chmod/Makefile b/bin/chmod/Makefile
index dc9390bb289f..71006d00a523 100644
--- a/bin/chmod/Makefile
+++ b/bin/chmod/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	chmod
 
diff --git a/bin/chmod/chmod.1 b/bin/chmod/chmod.1
index 3b2ecc9a8fa0..9726006ea23c 100644
--- a/bin/chmod/chmod.1
+++ b/bin/chmod/chmod.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chmod.1	8.4 (Berkeley) 3/31/94
-.\"	$Id: chmod.1,v 1.13 1999/08/14 06:26:14 chris Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 31, 1994
 .Dt CHMOD 1
diff --git a/bin/chmod/chmod.c b/bin/chmod/chmod.c
index 0758c42319d0..21841c6fdc17 100644
--- a/bin/chmod/chmod.c
+++ b/bin/chmod/chmod.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)chmod.c	8.8 (Berkeley) 4/1/94";
 #endif
 static const char rcsid[] =
-	"$Id: chmod.c,v 1.12 1998/12/16 04:42:00 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/cp/Makefile b/bin/cp/Makefile
index 1ea50c99dec0..1b0037f35f2f 100644
--- a/bin/cp/Makefile
+++ b/bin/cp/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.5 1998/11/14 23:43:11 wosch Exp $
+# $FreeBSD$
 
 PROG=	cp
 SRCS=	cp.c utils.c
diff --git a/bin/cp/cp.1 b/bin/cp/cp.1
index c3ae299f1ebb..29a997f4e540 100644
--- a/bin/cp/cp.1
+++ b/bin/cp/cp.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
-.\"	$Id: cp.1,v 1.12 1999/05/08 10:19:25 kris Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt CP 1
diff --git a/bin/cp/cp.c b/bin/cp/cp.c
index 77587c98ef9b..488e7d81d0ed 100644
--- a/bin/cp/cp.c
+++ b/bin/cp/cp.c
@@ -45,7 +45,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)cp.c	8.2 (Berkeley) 4/1/94";
 #endif
 static const char rcsid[] =
-	"$Id: cp.c,v 1.20 1999/07/10 05:46:44 kris Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/bin/cp/extern.h b/bin/cp/extern.h
index c53970c97981..272d632d3ed2 100644
--- a/bin/cp/extern.h
+++ b/bin/cp/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/1/94
- *	$Id: extern.h,v 1.7 1997/02/22 14:01:33 peter Exp $
+ * $FreeBSD$
  */
 
 typedef struct {
diff --git a/bin/cp/utils.c b/bin/cp/utils.c
index 837a3da6944b..2c02947cdd59 100644
--- a/bin/cp/utils.c
+++ b/bin/cp/utils.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)utils.c	8.3 (Berkeley) 4/1/94";
 #endif
 static const char rcsid[] =
-	"$Id: utils.c,v 1.23 1999/05/08 10:19:29 kris Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index 0dc44c5aaa60..cd05e53a5185 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.8 1997/08/07 21:42:01 steve Exp $
+# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 #
 # C Shell with process control; VM/UNIX VAX Makefile
diff --git a/bin/csh/USD.doc/Makefile b/bin/csh/USD.doc/Makefile
index c85e28041507..e067417f94b3 100644
--- a/bin/csh/USD.doc/Makefile
+++ b/bin/csh/USD.doc/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
-#	$Id$
+# $FreeBSD$
 
 DIR=	usd/04.csh
 SRCS=	tabs csh.1 csh.2 csh.3 csh.4 csh.a csh.g
diff --git a/bin/csh/USD.doc/csh.1 b/bin/csh/USD.doc/csh.1
index 34c8e13a4ea3..0f5b387220db 100644
--- a/bin/csh/USD.doc/csh.1
+++ b/bin/csh/USD.doc/csh.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.1	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .EH 'USD:4-%''An Introduction to the C shell'
 .OH 'An Introduction to the C shell''USD:4-%'
diff --git a/bin/csh/USD.doc/csh.2 b/bin/csh/USD.doc/csh.2
index 29fabea00a4b..18d9439240a5 100644
--- a/bin/csh/USD.doc/csh.2
+++ b/bin/csh/USD.doc/csh.2
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.2	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .nr H1 1
 .NH
diff --git a/bin/csh/USD.doc/csh.3 b/bin/csh/USD.doc/csh.3
index d6e3819c55d9..6a85fe063716 100644
--- a/bin/csh/USD.doc/csh.3
+++ b/bin/csh/USD.doc/csh.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.3	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .nr H1 2
 .NH
diff --git a/bin/csh/USD.doc/csh.4 b/bin/csh/USD.doc/csh.4
index 2b2aaa9920a0..8a2bcbda5ecd 100644
--- a/bin/csh/USD.doc/csh.4
+++ b/bin/csh/USD.doc/csh.4
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.4	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .nr H1 3
 .NH
diff --git a/bin/csh/USD.doc/csh.a b/bin/csh/USD.doc/csh.a
index f01312a41b94..176534fac1d3 100644
--- a/bin/csh/USD.doc/csh.a
+++ b/bin/csh/USD.doc/csh.a
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.a	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .SH
 Appendix \- Special characters
diff --git a/bin/csh/USD.doc/csh.g b/bin/csh/USD.doc/csh.g
index ac27152bccd6..41151735df23 100644
--- a/bin/csh/USD.doc/csh.g
+++ b/bin/csh/USD.doc/csh.g
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.g	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .SH
 Glossary
diff --git a/bin/csh/USD.doc/tabs b/bin/csh/USD.doc/tabs
index 84deab72a15f..7066e0716d36 100644
--- a/bin/csh/USD.doc/tabs
+++ b/bin/csh/USD.doc/tabs
@@ -30,6 +30,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tabs	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .ta 5n 10n 15n 20n 25n 30n 35n 40n 45n 50n 55n 60n 65n 70n 75n 80n
diff --git a/bin/csh/alloc.c b/bin/csh/alloc.c
index 142206bb8dd9..16533298f62f 100644
--- a/bin/csh/alloc.c
+++ b/bin/csh/alloc.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)alloc.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: alloc.c,v 1.8 1998/05/06 06:50:37 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/char.c b/bin/csh/char.c
index 9ae8b21d3631..b2aa378df682 100644
--- a/bin/csh/char.c
+++ b/bin/csh/char.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)char.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: char.c,v 1.4 1997/02/22 14:01:37 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/char.h b/bin/csh/char.h
index 9fba6f7157bf..396e7ab34067 100644
--- a/bin/csh/char.h
+++ b/bin/csh/char.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)char.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <ctype.h>
diff --git a/bin/csh/const.c b/bin/csh/const.c
index bf04f329f930..41de3c124157 100644
--- a/bin/csh/const.c
+++ b/bin/csh/const.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)const.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: const.c,v 1.6 1997/02/22 14:01:39 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/csh.1 b/bin/csh/csh.1
index abdc4e88576b..af0fc3e49b8e 100644
--- a/bin/csh/csh.1
+++ b/bin/csh/csh.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)csh.1	8.2 (Berkeley) 1/21/94
-.\"	$Id: csh.1,v 1.11 1998/07/27 21:31:19 nectar Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 21, 1994
 .Dt CSH 1
diff --git a/bin/csh/csh.c b/bin/csh/csh.c
index e879e5c137a0..0bbc55773c1b 100644
--- a/bin/csh/csh.c
+++ b/bin/csh/csh.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)csh.c	8.2 (Berkeley) 10/12/93";
 #else
 static const char rcsid[] =
-	"$Id: csh.c,v 1.13 1998/02/28 10:49:52 jraynard Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/csh.h b/bin/csh/csh.h
index 7193dcbc3507..cf6723f92aeb 100644
--- a/bin/csh/csh.h
+++ b/bin/csh/csh.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)csh.h	8.1 (Berkeley) 5/31/93
- *	$Id: csh.h,v 1.6 1997/08/08 00:53:59 steve Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/bin/csh/dir.c b/bin/csh/dir.c
index b1fc00d79f91..62acd391493c 100644
--- a/bin/csh/dir.c
+++ b/bin/csh/dir.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)dir.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: dir.c,v 1.8 1998/06/09 03:38:37 imp Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/dir.h b/bin/csh/dir.h
index ec57104831cf..285acb7ccca3 100644
--- a/bin/csh/dir.h
+++ b/bin/csh/dir.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dir.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/bin/csh/dol.c b/bin/csh/dol.c
index 79a53496a040..fdab1077077f 100644
--- a/bin/csh/dol.c
+++ b/bin/csh/dol.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)dol.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: dol.c,v 1.8 1998/05/13 07:28:52 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/err.c b/bin/csh/err.c
index 82b03a183fce..9eb689d64665 100644
--- a/bin/csh/err.c
+++ b/bin/csh/err.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: err.c,v 1.8 1998/05/13 07:28:55 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/exec.c b/bin/csh/exec.c
index c47cf7d2b59c..64d45d29fadd 100644
--- a/bin/csh/exec.c
+++ b/bin/csh/exec.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)exec.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: exec.c,v 1.9 1998/02/28 10:49:54 jraynard Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/exp.c b/bin/csh/exp.c
index 46ba511c1a8c..b6ec28095c53 100644
--- a/bin/csh/exp.c
+++ b/bin/csh/exp.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)exp.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: exp.c,v 1.6 1998/05/06 06:50:44 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/extern.h b/bin/csh/extern.h
index d49a3f182ec6..a1cbfcb5aa23 100644
--- a/bin/csh/extern.h
+++ b/bin/csh/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- *	$Id: extern.h,v 1.4 1997/02/22 14:01:53 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/cdefs.h>
diff --git a/bin/csh/file.c b/bin/csh/file.c
index 6a3f94b077b2..a1f5ab2f19bf 100644
--- a/bin/csh/file.c
+++ b/bin/csh/file.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)file.c	8.2 (Berkeley) 3/19/94";
 #else
 static const char rcsid[] =
-	"$Id: file.c,v 1.8 1998/02/01 17:11:01 steve Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/func.c b/bin/csh/func.c
index 0b1326a5362c..070fc84754de 100644
--- a/bin/csh/func.c
+++ b/bin/csh/func.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)func.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: func.c,v 1.12 1999/04/25 21:13:32 imp Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/glob.c b/bin/csh/glob.c
index 589ad61092e0..09c928a570ec 100644
--- a/bin/csh/glob.c
+++ b/bin/csh/glob.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)glob.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: glob.c,v 1.10 1997/08/08 00:54:03 steve Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/hist.c b/bin/csh/hist.c
index f76edece166d..2df74e1d1740 100644
--- a/bin/csh/hist.c
+++ b/bin/csh/hist.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)hist.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: hist.c,v 1.7 1998/05/06 06:50:50 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/init.c b/bin/csh/init.c
index e74bec38c043..c290a6b5d85b 100644
--- a/bin/csh/init.c
+++ b/bin/csh/init.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)init.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: init.c,v 1.4 1997/02/22 14:02:00 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/lex.c b/bin/csh/lex.c
index c234b98f2969..6ea61ace58ae 100644
--- a/bin/csh/lex.c
+++ b/bin/csh/lex.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)lex.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: lex.c,v 1.11 1999/04/25 21:13:32 imp Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/misc.c b/bin/csh/misc.c
index 0584a3dc54a1..56491d12163f 100644
--- a/bin/csh/misc.c
+++ b/bin/csh/misc.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: misc.c,v 1.7 1998/05/06 06:50:53 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/parse.c b/bin/csh/parse.c
index c4bf1823fed3..4cb2fcf5af1c 100644
--- a/bin/csh/parse.c
+++ b/bin/csh/parse.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: parse.c,v 1.7 1998/05/06 06:50:56 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/pathnames.h b/bin/csh/pathnames.h
index 9fc456e0c15f..bcdb4caf46f0 100644
--- a/bin/csh/pathnames.h
+++ b/bin/csh/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
- *	$Id: pathnames.h,v 1.4 1997/02/22 14:02:05 peter Exp $
+ * $FreeBSD$
  */
 
 #define	_PATH_BIN		"/bin"
diff --git a/bin/csh/proc.c b/bin/csh/proc.c
index 503681b74ddc..a6631ec3eb30 100644
--- a/bin/csh/proc.c
+++ b/bin/csh/proc.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)proc.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: proc.c,v 1.9 1998/05/06 06:50:58 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/proc.h b/bin/csh/proc.h
index c621a742787f..0aa52595ba82 100644
--- a/bin/csh/proc.h
+++ b/bin/csh/proc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)proc.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/bin/csh/sem.c b/bin/csh/sem.c
index 33047f7dfac4..ee7eb2076a61 100644
--- a/bin/csh/sem.c
+++ b/bin/csh/sem.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)sem.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: sem.c,v 1.9 1999/04/25 21:13:32 imp Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/set.c b/bin/csh/set.c
index 82785d1032b1..af6c6cd19241 100644
--- a/bin/csh/set.c
+++ b/bin/csh/set.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)set.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: set.c,v 1.10 1998/05/13 07:29:15 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/str.c b/bin/csh/str.c
index ab84d5f8f14d..e205e22ed6dd 100644
--- a/bin/csh/str.c
+++ b/bin/csh/str.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)str.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: str.c,v 1.5 1997/02/22 14:02:09 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/csh/time.c b/bin/csh/time.c
index 95620ff2d4e9..bda3874b5dd1 100644
--- a/bin/csh/time.c
+++ b/bin/csh/time.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)time.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: time.c,v 1.8 1997/08/07 21:42:17 steve Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/date/Makefile b/bin/date/Makefile
index cf3ceb4c0419..8a1dc8579330 100644
--- a/bin/date/Makefile
+++ b/bin/date/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.6 1997/08/09 22:34:01 brian Exp $
+# $FreeBSD$
 
 PROG=	date
 SRCS=	date.c netdate.c vary.c
diff --git a/bin/date/date.1 b/bin/date/date.1
index 5dd6ba46f346..8cf4246be9c9 100644
--- a/bin/date/date.1
+++ b/bin/date/date.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.3 (Berkeley) 4/28/95
-.\"	$Id: date.1,v 1.29 1999/05/14 00:28:39 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 17, 1993
 .Dt DATE 1
diff --git a/bin/date/date.c b/bin/date/date.c
index f1d2e2531e51..d699755c7d0f 100644
--- a/bin/date/date.c
+++ b/bin/date/date.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)date.c	8.2 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: date.c,v 1.28 1999/05/14 00:28:41 jmg Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/date/extern.h b/bin/date/extern.h
index c21fdc63d0b2..4726eb6a97c3 100644
--- a/bin/date/extern.h
+++ b/bin/date/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 int	netsettime __P((time_t));
diff --git a/bin/date/netdate.c b/bin/date/netdate.c
index 2e7e56684ae4..3ec041ad1813 100644
--- a/bin/date/netdate.c
+++ b/bin/date/netdate.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)netdate.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-	"$Id: netdate.c,v 1.9 1998/05/06 06:51:18 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/date/vary.c b/bin/date/vary.c
index 0e82722ed1c0..43697531a626 100644
--- a/bin/date/vary.c
+++ b/bin/date/vary.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: vary.c,v 1.5 1999/03/09 09:38:54 brian Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <time.h>
diff --git a/bin/date/vary.h b/bin/date/vary.h
index 742b560fcba5..b39306a2bb23 100644
--- a/bin/date/vary.h
+++ b/bin/date/vary.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 struct vary {
diff --git a/bin/dd/Makefile b/bin/dd/Makefile
index 56e22e090343..cd6156d7ebab 100644
--- a/bin/dd/Makefile
+++ b/bin/dd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.5 1998/01/07 22:31:17 joerg Exp $
+# $FreeBSD$
 
 PROG=	dd
 SRCS=	args.c conv.c conv_tab.c dd.c misc.c position.c
diff --git a/bin/dd/args.c b/bin/dd/args.c
index cbdf755516bf..3de0e30336e6 100644
--- a/bin/dd/args.c
+++ b/bin/dd/args.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)args.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: args.c,v 1.14 1999/05/08 10:20:05 kris Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/dd/conv.c b/bin/dd/conv.c
index 060b1754f6db..bf47410285af 100644
--- a/bin/dd/conv.c
+++ b/bin/dd/conv.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)conv.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: conv.c,v 1.10 1998/05/13 07:33:39 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/dd/conv_tab.c b/bin/dd/conv_tab.c
index f5fe7ac98e11..8637bdd33c72 100644
--- a/bin/dd/conv_tab.c
+++ b/bin/dd/conv_tab.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)conv_tab.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-	"$Id: conv_tab.c,v 1.7 1998/05/06 06:51:32 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/dd/dd.1 b/bin/dd/dd.1
index 4fef22b56533..49831dfdff57 100644
--- a/bin/dd/dd.1
+++ b/bin/dd/dd.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
-.\"	$Id: dd.1,v 1.9 1999/05/08 10:20:07 kris Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 13, 1994
 .Dt DD 1
diff --git a/bin/dd/dd.c b/bin/dd/dd.c
index ece32c4b762b..c80ed685312b 100644
--- a/bin/dd/dd.c
+++ b/bin/dd/dd.c
@@ -46,7 +46,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)dd.c	8.5 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: dd.c,v 1.19 1999/07/13 18:44:56 green Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/dd/dd.h b/bin/dd/dd.h
index 9344d3d1eed8..f629a5e2e6a8 100644
--- a/bin/dd/dd.h
+++ b/bin/dd/dd.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dd.h	8.3 (Berkeley) 4/2/94
- *	$Id: dd.h,v 1.10 1999/06/20 14:58:51 green Exp $
+ * $FreeBSD$
  */
 
 /* Input/output stream state. */
diff --git a/bin/dd/extern.h b/bin/dd/extern.h
index 311dc1c52a09..a5495ad2979a 100644
--- a/bin/dd/extern.h
+++ b/bin/dd/extern.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.3 (Berkeley) 4/2/94
- *	$Id: extern.h,v 1.4 1997/02/22 14:02:46 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/cdefs.h>
diff --git a/bin/dd/misc.c b/bin/dd/misc.c
index ac994d8e264c..8d756683e434 100644
--- a/bin/dd/misc.c
+++ b/bin/dd/misc.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: misc.c,v 1.15 1998/12/07 12:37:11 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/dd/position.c b/bin/dd/position.c
index ae5191f820c2..5299c5bde55b 100644
--- a/bin/dd/position.c
+++ b/bin/dd/position.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)position.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: position.c,v 1.10 1999/06/20 14:58:55 green Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/df/Makefile b/bin/df/Makefile
index d87f2729f832..83d1bbd4c77e 100644
--- a/bin/df/Makefile
+++ b/bin/df/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.6 1997/08/07 21:30:59 steve Exp $
+# $FreeBSD$
 #	@(#)Makefile	8.3 (Berkeley) 5/8/95
 
 PROG=	df
diff --git a/bin/df/df.1 b/bin/df/df.1
index 6f339863ad1b..9c875dc47eb1 100644
--- a/bin/df/df.1
+++ b/bin/df/df.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)df.1	8.3 (Berkeley) 5/8/95
-.\"	$Id: df.1,v 1.14 1999/02/12 02:12:06 alex Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 8, 1995
 .Dt DF 1
diff --git a/bin/df/df.c b/bin/df/df.c
index 42ce083c06be..b402efd13864 100644
--- a/bin/df/df.c
+++ b/bin/df/df.c
@@ -47,7 +47,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)df.c	8.9 (Berkeley) 5/8/95";
 #else
 static const char rcsid[] =
-	"$Id: df.c,v 1.19 1997/10/13 09:36:05 joerg Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/domainname/Makefile b/bin/domainname/Makefile
index 8274b61c0ad6..724bd06f6a39 100644
--- a/bin/domainname/Makefile
+++ b/bin/domainname/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	domainname
 
diff --git a/bin/domainname/domainname.1 b/bin/domainname/domainname.1
index 922e3479d51c..96e4f076fdf6 100644
--- a/bin/domainname/domainname.1
+++ b/bin/domainname/domainname.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)hostname.1	8.1 (Berkeley) 5/31/93
-.\"	$Id: domainname.1,v 1.6 1998/05/13 07:37:23 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 18, 1994
 .Dt DOMAINNAME 1
diff --git a/bin/domainname/domainname.c b/bin/domainname/domainname.c
index 8c7b77672fa2..d0c989c39fdd 100644
--- a/bin/domainname/domainname.c
+++ b/bin/domainname/domainname.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char const sccsid[] = "From: @(#)hostname.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/echo/Makefile b/bin/echo/Makefile
index c296871792c5..d00d4679d7ac 100644
--- a/bin/echo/Makefile
+++ b/bin/echo/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	echo
 
diff --git a/bin/echo/echo.1 b/bin/echo/echo.1
index 765c14388ca0..1636b7d90e75 100644
--- a/bin/echo/echo.1
+++ b/bin/echo/echo.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.1 (Berkeley) 7/22/93
-.\"	$Id: echo.1,v 1.6 1998/05/13 07:39:07 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 22, 1993
 .Dt ECHO 1
diff --git a/bin/echo/echo.c b/bin/echo/echo.c
index 0d342cc160ac..edab483ddbbc 100644
--- a/bin/echo/echo.c
+++ b/bin/echo/echo.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)echo.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/bin/ed/Makefile b/bin/ed/Makefile
index 165fa77bf527..a1f11af8a520 100644
--- a/bin/ed/Makefile
+++ b/bin/ed/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.15 1997/02/22 14:03:08 peter Exp $
+# $FreeBSD$
 
 PROG=	ed
 SRCS=	buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
diff --git a/bin/ed/POSIX b/bin/ed/POSIX
index db1a155e2cf2..47b720d867ef 100644
--- a/bin/ed/POSIX
+++ b/bin/ed/POSIX
@@ -1,4 +1,4 @@
-$Id$
+$FreeBSD$
 
 This version of ed(1) is not strictly POSIX compliant, as described in
 the POSIX 1003.2 document.  The following is a summary of the omissions,
diff --git a/bin/ed/README b/bin/ed/README
index 322e65e0fcaf..478e7af07c70 100644
--- a/bin/ed/README
+++ b/bin/ed/README
@@ -1,4 +1,4 @@
-$Id$
+$FreeBSD$
 
 ed is an 8-bit-clean, POSIX-compliant line editor.  It should work with
 any regular expression package that conforms to the POSIX interface
diff --git a/bin/ed/buf.c b/bin/ed/buf.c
index f3ee70b2a15a..4e2479642552 100644
--- a/bin/ed/buf.c
+++ b/bin/ed/buf.c
@@ -31,7 +31,7 @@
 static char * const rcsid = "@(#)buf.c,v 1.4 1994/02/01 00:34:35 alm Exp";
 #else
 static char * const rcsid =
-	"$Id: buf.c,v 1.15 1997/12/31 12:25:33 helbig Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/ed/cbc.c b/bin/ed/cbc.c
index fba3609b06e8..f77ce0dc5a18 100644
--- a/bin/ed/cbc.c
+++ b/bin/ed/cbc.c
@@ -42,7 +42,7 @@
 static char * const rcsid = "@(#)cbc.c,v 1.2 1994/02/01 00:34:36 alm Exp";
 #else
 static char * const rcsid =
-	"$Id: cbc.c,v 1.10 1997/08/07 21:33:40 steve Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/ed/ed.1 b/bin/ed/ed.1
index 1ceeeab4478b..370e67225ed0 100644
--- a/bin/ed/ed.1
+++ b/bin/ed/ed.1
@@ -1,4 +1,4 @@
-.\"	$Id: ed.1,v 1.13 1998/05/13 07:41:13 charnier Exp $
+.\" $FreeBSD$
 .Dd May 21, 1993
 .Dt ED 1
 .Os
diff --git a/bin/ed/ed.h b/bin/ed/ed.h
index 05f65a9fd89b..d313a84f1cdf 100644
--- a/bin/ed/ed.h
+++ b/bin/ed/ed.h
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp
- *	$Id: ed.h,v 1.11 1997/12/10 22:18:23 eivind Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>		/* for MAXPATHLEN */
diff --git a/bin/ed/glbl.c b/bin/ed/glbl.c
index a40bca6ddeff..3eae4f250f82 100644
--- a/bin/ed/glbl.c
+++ b/bin/ed/glbl.c
@@ -31,7 +31,7 @@
 static char * const rcsid = "@(#)glob.c,v 1.1 1994/02/01 00:34:40 alm Exp";
 #else
 static char * const rcsid =
-	"$Id: glbl.c,v 1.7 1997/02/22 14:03:15 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/ed/io.c b/bin/ed/io.c
index 6702765df4bc..203079898f63 100644
--- a/bin/ed/io.c
+++ b/bin/ed/io.c
@@ -30,7 +30,7 @@
 static char * const rcsid = "@(#)io.c,v 1.1 1994/02/01 00:34:41 alm Exp";
 #else
 static char * const rcsid =
-	"$Id: io.c,v 1.8 1997/02/22 14:03:16 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/ed/main.c b/bin/ed/main.c
index 8468bbd2a846..7bff1297900a 100644
--- a/bin/ed/main.c
+++ b/bin/ed/main.c
@@ -37,7 +37,7 @@ static char * const copyright =
 static char * const rcsid = "@(#)main.c,v 1.1 1994/02/01 00:34:42 alm Exp";
 #else
 static char * const rcsid =
-	"$Id: main.c,v 1.12 1997/10/08 14:47:56 eivind Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/ed/re.c b/bin/ed/re.c
index 65b25a20f948..d81d0d786e95 100644
--- a/bin/ed/re.c
+++ b/bin/ed/re.c
@@ -31,7 +31,7 @@
 static char * const rcsid = "@(#)re.c,v 1.6 1994/02/01 00:34:43 alm Exp";
 #else
 static char * const rcsid =
-	"$Id: re.c,v 1.13 1997/02/22 14:03:18 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/ed/sub.c b/bin/ed/sub.c
index e0725487d78b..32213734b6b7 100644
--- a/bin/ed/sub.c
+++ b/bin/ed/sub.c
@@ -31,7 +31,7 @@
 static char * const rcsid = "@(#)sub.c,v 1.1 1994/02/01 00:34:44 alm Exp";
 #else
 static char * const rcsid =
-	"$Id: sub.c,v 1.10 1997/08/07 21:33:44 steve Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/ed/test/Makefile b/bin/ed/test/Makefile
index 70f24055b067..aedfb698f131 100644
--- a/bin/ed/test/Makefile
+++ b/bin/ed/test/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 SHELL=	/bin/sh
 ED=	${.OBJDIR}/ed
diff --git a/bin/ed/test/README b/bin/ed/test/README
index 72c7217f0f0e..74c4826a269d 100644
--- a/bin/ed/test/README
+++ b/bin/ed/test/README
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 The files in this directory with suffixes `.t', `.d', `.r' and `.err' are
 used for testing ed.  To run the tests, set the ED variable in the Makefile
diff --git a/bin/ed/test/ckscripts.sh b/bin/ed/test/ckscripts.sh
index f58c60977b5b..deab47555f7a 100644
--- a/bin/ed/test/ckscripts.sh
+++ b/bin/ed/test/ckscripts.sh
@@ -3,7 +3,7 @@
 # and compares their output against the .r files, which contain
 # the correct output
 #
-#	$Id$
+# $FreeBSD$
 
 PATH="/bin:/usr/bin:/usr/local/bin/:."
 ED=$1
diff --git a/bin/ed/test/mkscripts.sh b/bin/ed/test/mkscripts.sh
index 3e1a3d4c543a..1b8b3ee53182 100644
--- a/bin/ed/test/mkscripts.sh
+++ b/bin/ed/test/mkscripts.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -
 # This script generates ed test scripts (.ed) from .t files
 #	
-#	$Id$
+# $FreeBSD$
 
 PATH="/bin:/usr/bin:/usr/local/bin/:."
 ED=$1
diff --git a/bin/ed/undo.c b/bin/ed/undo.c
index 93fef8853dd0..b2063c7c2791 100644
--- a/bin/ed/undo.c
+++ b/bin/ed/undo.c
@@ -30,7 +30,7 @@
 static char * const rcsid = "@(#)undo.c,v 1.1 1994/02/01 00:34:44 alm Exp";
 #else
 static char * const rcsid =
-	"$Id: undo.c,v 1.7 1997/08/07 21:33:47 steve Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/expr/Makefile b/bin/expr/Makefile
index 215b498db522..544853e10a25 100644
--- a/bin/expr/Makefile
+++ b/bin/expr/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.12 1997/02/22 14:03:36 peter Exp $
+# $FreeBSD$
 
 PROG=	expr
 SRCS=	expr.y
diff --git a/bin/expr/expr.1 b/bin/expr/expr.1
index b3f67fb52d93..85a0c8ebf601 100644
--- a/bin/expr/expr.1
+++ b/bin/expr/expr.1
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: expr.1,v 1.7 1998/05/13 07:43:56 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 3, 1993
 .Dt EXPR 1
diff --git a/bin/expr/expr.y b/bin/expr/expr.y
index 626de8e05b33..117270a14f77 100644
--- a/bin/expr/expr.y
+++ b/bin/expr/expr.y
@@ -4,7 +4,7 @@
  *
  * Largely rewritten by J.T. Conklin (jtc@wimsey.com)
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/bin/hostname/Makefile b/bin/hostname/Makefile
index adee034af686..3c7997f862fc 100644
--- a/bin/hostname/Makefile
+++ b/bin/hostname/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	hostname
 
diff --git a/bin/hostname/hostname.1 b/bin/hostname/hostname.1
index 94aa27cf3e2d..835d586e088a 100644
--- a/bin/hostname/hostname.1
+++ b/bin/hostname/hostname.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hostname.1	8.2 (Berkeley) 4/28/95
-.\"	$Id: hostname.1,v 1.7 1997/06/03 06:21:45 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 28, 1995
 .Dt HOSTNAME 1
diff --git a/bin/hostname/hostname.c b/bin/hostname/hostname.c
index d8a81f46813e..94e5d4a72434 100644
--- a/bin/hostname/hostname.c
+++ b/bin/hostname/hostname.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)hostname.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/kill/Makefile b/bin/kill/Makefile
index 610341f6b8c1..55ef16dfce2c 100644
--- a/bin/kill/Makefile
+++ b/bin/kill/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	kill
 
diff --git a/bin/kill/kill.1 b/bin/kill/kill.1
index cc8266923224..3264f31085cf 100644
--- a/bin/kill/kill.1
+++ b/bin/kill/kill.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)kill.1	8.2 (Berkeley) 4/28/95
-.\"	$Id: kill.1,v 1.7 1998/05/13 07:47:33 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 28, 1995
 .Dt KILL 1
diff --git a/bin/kill/kill.c b/bin/kill/kill.c
index e0ad9405ae11..9de184f0cfa1 100644
--- a/bin/kill/kill.c
+++ b/bin/kill/kill.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)kill.c	8.4 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/bin/ln/Makefile b/bin/ln/Makefile
index 83a6e1dca2f1..b177ea8b272a 100644
--- a/bin/ln/Makefile
+++ b/bin/ln/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	ln
 MAN1=	ln.1
diff --git a/bin/ln/ln.1 b/bin/ln/ln.1
index 19c63d206405..93fa3df56bcb 100644
--- a/bin/ln/ln.1
+++ b/bin/ln/ln.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ln.1	8.2 (Berkeley) 12/30/93
-.\"	$Id: ln.1,v 1.6 1998/05/15 06:19:02 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt LN 1
diff --git a/bin/ln/ln.c b/bin/ln/ln.c
index 94e0c06f1eaf..9ccf805e1b2d 100644
--- a/bin/ln/ln.c
+++ b/bin/ln/ln.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)ln.c	8.2 (Berkeley) 3/31/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/ln/symlink.7 b/bin/ln/symlink.7
index 55b905da53ec..6e6d5a7fe56f 100644
--- a/bin/ln/symlink.7
+++ b/bin/ln/symlink.7
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)symlink.7	8.3 (Berkeley) 3/31/94
-.\"	$Id: symlink.7,v 1.10 1999/04/24 10:08:09 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 31, 1994
 .Dt SYMLINK 7
diff --git a/bin/ls/Makefile b/bin/ls/Makefile
index d1a6b6b84384..fe40df1b1d7f 100644
--- a/bin/ls/Makefile
+++ b/bin/ls/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	ls
 SRCS=	cmp.c stat_flags.c ls.c print.c util.c
diff --git a/bin/ls/cmp.c b/bin/ls/cmp.c
index bf4965970e0e..91852ba76fc2 100644
--- a/bin/ls/cmp.c
+++ b/bin/ls/cmp.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)cmp.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: cmp.c,v 1.7 1997/08/07 15:33:45 steve Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/ls/extern.h b/bin/ls/extern.h
index 4a58fffcae5c..fd26b372c5f7 100644
--- a/bin/ls/extern.h
+++ b/bin/ls/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)extern.h	8.1 (Berkeley) 5/31/93
- *	$Id: extern.h,v 1.5 1997/08/07 15:33:45 steve Exp $
+ * $FreeBSD$
  */
 
 int	 acccmp __P((const FTSENT *, const FTSENT *));
diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
index d5611f776ec3..2697622393b6 100644
--- a/bin/ls/ls.1
+++ b/bin/ls/ls.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
-.\"	$Id: ls.1,v 1.28 1999/05/08 10:20:27 kris Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 29, 1994
 .Dt LS 1
diff --git a/bin/ls/ls.c b/bin/ls/ls.c
index 86599c691ffe..70b031e63c98 100644
--- a/bin/ls/ls.c
+++ b/bin/ls/ls.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ls.c	8.5 (Berkeley) 4/2/94";
 #else
 static const char rcsid[] =
-	"$Id: ls.c,v 1.27 1999/08/19 13:04:08 sheldonh Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/ls/ls.h b/bin/ls/ls.h
index b064d18f7c19..33c98c45aab8 100644
--- a/bin/ls/ls.h
+++ b/bin/ls/ls.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ls.h	8.1 (Berkeley) 5/31/93
- *	$Id: ls.h,v 1.9 1998/04/24 07:49:49 des Exp $
+ * $FreeBSD$
  */
 
 #define NO_PRINT	1
diff --git a/bin/ls/print.c b/bin/ls/print.c
index 8153171d0f81..584a517a4926 100644
--- a/bin/ls/print.c
+++ b/bin/ls/print.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)print.c	8.4 (Berkeley) 4/17/94";
 #else
 static const char rcsid[] =
-	"$Id: print.c,v 1.16 1998/04/24 07:49:50 des Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/ls/stat_flags.c b/bin/ls/stat_flags.c
index f8472966fdfd..5235eb31ffa6 100644
--- a/bin/ls/stat_flags.c
+++ b/bin/ls/stat_flags.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)stat_flags.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: stat_flags.c,v 1.9 1998/01/09 06:14:59 jb Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/ls/util.c b/bin/ls/util.c
index 9d5ba39bcec9..eea247587a9c 100644
--- a/bin/ls/util.c
+++ b/bin/ls/util.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/2/94";
 #else
 static const char rcsid[] =
-	"$Id: util.c,v 1.18 1998/10/13 12:19:31 des Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/mkdir/Makefile b/bin/mkdir/Makefile
index 03ca565911e9..fadc6b294ef7 100644
--- a/bin/mkdir/Makefile
+++ b/bin/mkdir/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	mkdir
 
diff --git a/bin/mkdir/mkdir.1 b/bin/mkdir/mkdir.1
index 269c096c04f3..ca092ef20ece 100644
--- a/bin/mkdir/mkdir.1
+++ b/bin/mkdir/mkdir.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mkdir.1	8.2 (Berkeley) 1/25/94
-.\"	$Id: mkdir.1,v 1.7 1998/05/15 06:23:43 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 25, 1994
 .Dt MKDIR 1
diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c
index f9a7ef5e3d6f..06178c1a38ba 100644
--- a/bin/mkdir/mkdir.c
+++ b/bin/mkdir/mkdir.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)mkdir.c	8.2 (Berkeley) 1/25/94";
 #endif
 static const char rcsid[] =
-	"$Id: mkdir.c,v 1.15 1998/10/23 06:28:40 msmith Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/mv/Makefile b/bin/mv/Makefile
index 0ba523e61b44..301fb2c5087a 100644
--- a/bin/mv/Makefile
+++ b/bin/mv/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/2/94
-#	$Id$
+# $FreeBSD$
 
 PROG=	mv
 
diff --git a/bin/mv/mv.1 b/bin/mv/mv.1
index 664bac47b3e3..be97d80e1b09 100644
--- a/bin/mv/mv.1
+++ b/bin/mv/mv.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mv.1	8.1 (Berkeley) 5/31/93
-.\"	$Id: mv.1,v 1.11 1998/05/15 06:25:16 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 31, 1993
 .Dt MV 1
diff --git a/bin/mv/mv.c b/bin/mv/mv.c
index b471bef4b1fa..6db419244166 100644
--- a/bin/mv/mv.c
+++ b/bin/mv/mv.c
@@ -45,7 +45,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)mv.c	8.2 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: mv.c,v 1.21 1998/06/28 21:00:04 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/mv/pathnames.h b/bin/mv/pathnames.h
index 4adf62b4ec5f..b9cd27ff297c 100644
--- a/bin/mv/pathnames.h
+++ b/bin/mv/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 #define	_PATH_RM	"/bin/rm"
diff --git a/bin/pax/Makefile b/bin/pax/Makefile
index cd0cc2d82e4c..b1a4dcf88f10 100644
--- a/bin/pax/Makefile
+++ b/bin/pax/Makefile
@@ -1,5 +1,5 @@
 #       @(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 # To install on versions prior to BSD 4.4 the following may have to be
 # defined with CFLAGS +=
diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
index 50551a201021..b286aa6c88c6 100644
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)ar_io.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-	"$Id: ar_io.c,v 1.10 1998/05/15 06:27:34 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
index e4bc37b15c51..151fe2aa0206 100644
--- a/bin/pax/ar_subs.c
+++ b/bin/pax/ar_subs.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)ar_subs.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-	"$Id: ar_subs.c,v 1.11 1998/05/15 06:27:36 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index cd11bae08a00..50c30761a3e5 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)buf_subs.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-	"$Id: buf_subs.c,v 1.10 1998/05/15 06:27:37 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/cache.c b/bin/pax/cache.c
index 9c9d95d7787b..7f3b37f6ee12 100644
--- a/bin/pax/cache.c
+++ b/bin/pax/cache.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)cache.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-	"$Id: cache.c,v 1.10 1998/05/15 06:27:37 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/cache.h b/bin/pax/cache.h
index 7d682a23f0c4..642058851070 100644
--- a/bin/pax/cache.h
+++ b/bin/pax/cache.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *      @(#)cache.h	8.1 (Berkeley) 5/31/93
- *	$Id: cache.h,v 1.4 1997/02/22 14:04:22 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
index 96f16f8b8e46..626a77d94c54 100644
--- a/bin/pax/cpio.c
+++ b/bin/pax/cpio.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)cpio.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-	"$Id: cpio.c,v 1.10 1998/05/15 06:27:38 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/cpio.h b/bin/pax/cpio.h
index 0bdbb6a39ab8..2b72f53b6c1e 100644
--- a/bin/pax/cpio.h
+++ b/bin/pax/cpio.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cpio.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/bin/pax/extern.h b/bin/pax/extern.h
index dda38ac7b8b1..2b062cbde300 100644
--- a/bin/pax/extern.h
+++ b/bin/pax/extern.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/18/94
- *	$Id: extern.h,v 1.4 1997/02/22 14:04:25 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
index f712c2915be3..b8f2a4917c7b 100644
--- a/bin/pax/file_subs.c
+++ b/bin/pax/file_subs.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)file_subs.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-	"$Id: file_subs.c,v 1.10 1998/05/15 06:27:39 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c
index dde85da76860..ba1e4890e455 100644
--- a/bin/pax/ftree.c
+++ b/bin/pax/ftree.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)ftree.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-	"$Id: ftree.c,v 1.11 1998/06/09 03:38:43 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/ftree.h b/bin/pax/ftree.h
index a98654632f54..e5c9749341a1 100644
--- a/bin/pax/ftree.h
+++ b/bin/pax/ftree.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ftree.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
index 501293d4f731..22b77f0feef8 100644
--- a/bin/pax/gen_subs.c
+++ b/bin/pax/gen_subs.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)gen_subs.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/options.c b/bin/pax/options.c
index c34677a25de3..4ea96e402297 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)options.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-	"$Id: options.c,v 1.11 1998/05/15 06:27:43 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/options.h b/bin/pax/options.h
index df1bd7daac41..b1de2b6de7cf 100644
--- a/bin/pax/options.h
+++ b/bin/pax/options.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)options.h	8.2 (Berkeley) 4/18/94
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c
index a02c3a392437..e68a0ebf6035 100644
--- a/bin/pax/pat_rep.c
+++ b/bin/pax/pat_rep.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)pat_rep.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-	"$Id: pat_rep.c,v 1.13 1998/12/05 10:29:10 obrien Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/pat_rep.h b/bin/pax/pat_rep.h
index e994a33cb6ed..e0d812b1de95 100644
--- a/bin/pax/pat_rep.h
+++ b/bin/pax/pat_rep.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pat_rep.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index a5366dfffeef..7684578c2deb 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pax.1	8.4 (Berkeley) 4/18/94
-.\"	$Id: pax.1,v 1.8 1998/05/31 22:43:57 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt PAX 1
diff --git a/bin/pax/pax.c b/bin/pax/pax.c
index bfd1f3d3d5f0..7bcc81e7ad0b 100644
--- a/bin/pax/pax.c
+++ b/bin/pax/pax.c
@@ -46,7 +46,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)pax.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-	"$Id: pax.c,v 1.11 1998/05/15 06:27:45 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/pax.h b/bin/pax/pax.h
index 41ef0bf94c50..a87b359f14b2 100644
--- a/bin/pax/pax.h
+++ b/bin/pax/pax.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pax.h	8.2 (Berkeley) 4/18/94
- *	$Id: pax.h,v 1.6 1997/02/22 14:04:40 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c
index d707ebf62cfe..ba7b71e7e012 100644
--- a/bin/pax/sel_subs.c
+++ b/bin/pax/sel_subs.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)sel_subs.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-	"$Id: sel_subs.c,v 1.9 1998/05/15 06:27:46 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/sel_subs.h b/bin/pax/sel_subs.h
index dbab257b3e83..ab24ab00d199 100644
--- a/bin/pax/sel_subs.h
+++ b/bin/pax/sel_subs.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sel_subs.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/bin/pax/tables.c b/bin/pax/tables.c
index f711af64bcf9..e6c106b83d58 100644
--- a/bin/pax/tables.c
+++ b/bin/pax/tables.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)tables.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-	"$Id: tables.c,v 1.11 1998/05/15 06:27:46 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/tables.h b/bin/pax/tables.h
index a7c73bed0afc..74c91f79d0ad 100644
--- a/bin/pax/tables.h
+++ b/bin/pax/tables.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tables.h	8.1 (Berkeley) 5/31/93
- *	$Id: tables.h,v 1.5 1997/02/22 14:04:44 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/bin/pax/tar.c b/bin/pax/tar.c
index 97a731a52e79..f5415f4f74ae 100644
--- a/bin/pax/tar.c
+++ b/bin/pax/tar.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)tar.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-	"$Id: tar.c,v 1.11 1998/10/20 05:52:33 msmith Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/pax/tar.h b/bin/pax/tar.h
index be244502a963..83df0da2784e 100644
--- a/bin/pax/tar.h
+++ b/bin/pax/tar.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tar.h	8.2 (Berkeley) 4/18/94
- *	$Id: tar.h,v 1.4 1997/02/22 14:04:46 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/bin/pax/tty_subs.c b/bin/pax/tty_subs.c
index 53017b8e093a..d70bffac1827 100644
--- a/bin/pax/tty_subs.c
+++ b/bin/pax/tty_subs.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)tty_subs.c	8.2 (Berkeley) 4/18/94";
 #endif
 static const char rcsid[] =
-	"$Id: tty_subs.c,v 1.9 1998/05/15 06:27:48 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/ps/Makefile b/bin/ps/Makefile
index 4e8d954d799c..c63e5a7ce5dd 100644
--- a/bin/ps/Makefile
+++ b/bin/ps/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.10 1997/08/13 17:35:00 steve Exp $
+# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
 
 PROG=	ps
diff --git a/bin/ps/extern.h b/bin/ps/extern.h
index 81a633b5b7c4..a14390dc1d1f 100644
--- a/bin/ps/extern.h
+++ b/bin/ps/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.3 (Berkeley) 4/2/94
- *	$Id: extern.h,v 1.7 1997/08/03 08:25:00 peter Exp $
+ * $FreeBSD$
  */
 
 struct kinfo;
diff --git a/bin/ps/fmt.c b/bin/ps/fmt.c
index f04ae9dc6391..9c0f8d3f1710 100644
--- a/bin/ps/fmt.c
+++ b/bin/ps/fmt.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)fmt.c	8.4 (Berkeley) 4/15/94";
 #endif
 static const char rcsid[] =
-	"$Id: fmt.c,v 1.12 1998/06/17 11:33:10 jkoshy Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index 9ac0f22a6715..cbabd978c784 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)keyword.c	8.5 (Berkeley) 4/2/94";
 #else
 static const char rcsid[] =
-	"$Id: keyword.c,v 1.22 1999/01/13 03:11:43 julian Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/ps/print.c b/bin/ps/print.c
index f60cab6e5034..a49c8fa656b2 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)print.c	8.6 (Berkeley) 4/16/94";
 #endif
 static const char rcsid[] =
-	"$Id: print.c,v 1.34 1999/04/06 03:17:57 peter Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index 66d907e6928a..f89f8da0ed6d 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
-.\"	$Id: ps.1,v 1.22 1999/05/08 10:21:31 kris Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt PS 1
diff --git a/bin/ps/ps.c b/bin/ps/ps.c
index a6a785917b4e..86407679b738 100644
--- a/bin/ps/ps.c
+++ b/bin/ps/ps.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)ps.c	8.4 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: ps.c,v 1.25 1998/06/30 21:34:14 phk Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/ps/ps.h b/bin/ps/ps.h
index cefa0676508a..f8d244c83e53 100644
--- a/bin/ps/ps.h
+++ b/bin/ps/ps.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ps.h	8.1 (Berkeley) 5/31/93
- *	$Id: ps.h,v 1.5 1997/04/29 05:26:05 jkh Exp $
+ * $FreeBSD$
  */
 
 #define	UNLIMITED	0	/* unlimited terminal width */
diff --git a/bin/pwd/Makefile b/bin/pwd/Makefile
index 4937fb391932..4a8e66ac8320 100644
--- a/bin/pwd/Makefile
+++ b/bin/pwd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	pwd
 
diff --git a/bin/pwd/pwd.1 b/bin/pwd/pwd.1
index 4c4ab8d4496e..27150e66ca6f 100644
--- a/bin/pwd/pwd.1
+++ b/bin/pwd/pwd.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pwd.1	8.2 (Berkeley) 4/28/95
-.\"	$Id: pwd.1,v 1.6 1998/05/15 06:30:57 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 28, 1995
 .Dt PWD 1
diff --git a/bin/pwd/pwd.c b/bin/pwd/pwd.c
index 92973f9b8e35..1adb3c86f508 100644
--- a/bin/pwd/pwd.c
+++ b/bin/pwd/pwd.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)pwd.c	8.3 (Berkeley) 4/1/94";
 #endif
 static const char rcsid[] =
-	"$Id: pwd.c,v 1.7 1998/05/15 06:30:58 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/bin/rcp/Makefile b/bin/rcp/Makefile
index 44ca5331ec67..adaf5c43b7bb 100644
--- a/bin/rcp/Makefile
+++ b/bin/rcp/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-#	$Id: Makefile,v 1.12 1998/10/09 06:31:45 markm Exp $
+# $FreeBSD$
 
 PROG=	rcp
 SRCS=	rcp.c util.c
diff --git a/bin/rcp/extern.h b/bin/rcp/extern.h
index ef055c4c7f47..5081c9dcbb57 100644
--- a/bin/rcp/extern.h
+++ b/bin/rcp/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 typedef struct {
diff --git a/bin/rcp/pathnames.h b/bin/rcp/pathnames.h
index 556043e82932..b1f0ec083179 100644
--- a/bin/rcp/pathnames.h
+++ b/bin/rcp/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <paths.h>
diff --git a/bin/rcp/rcp.1 b/bin/rcp/rcp.1
index b290c76b98fd..24a820b6371d 100644
--- a/bin/rcp/rcp.1
+++ b/bin/rcp/rcp.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rcp.1	8.1 (Berkeley) 5/31/93
-.\"	$Id: rcp.1,v 1.6 1998/05/18 06:36:02 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 31, 1993
 .Dt RCP 1
diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c
index 4dc8fa1e90cf..6582808d2e0a 100644
--- a/bin/rcp/rcp.c
+++ b/bin/rcp/rcp.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)rcp.c	8.2 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: rcp.c,v 1.22 1999/04/25 10:36:00 dt Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/rcp/util.c b/bin/rcp/util.c
index c7de9f63d68a..a8ba4c09f907 100644
--- a/bin/rcp/util.c
+++ b/bin/rcp/util.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)util.c	8.2 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/rm/Makefile b/bin/rm/Makefile
index 5d9fafea9735..45a5f23268f1 100644
--- a/bin/rm/Makefile
+++ b/bin/rm/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	rm
 SRCS=   rm.c stat_flags.c
diff --git a/bin/rm/rm.1 b/bin/rm/rm.1
index ac76673d9b3d..563ac1eb487d 100644
--- a/bin/rm/rm.1
+++ b/bin/rm/rm.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rm.1	8.5 (Berkeley) 12/5/94
-.\"	$Id: rm.1,v 1.13 1999/01/28 17:41:02 wollman Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 28, 1999
 .Dt RM 1
diff --git a/bin/rm/rm.c b/bin/rm/rm.c
index 4599c9e21912..0eec4f27cf11 100644
--- a/bin/rm/rm.c
+++ b/bin/rm/rm.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)rm.c	8.5 (Berkeley) 4/18/94";
 #else
 static const char rcsid[] =
-	"$Id: rm.c,v 1.19 1999/02/25 22:18:08 jkh Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/rmail/Makefile b/bin/rmail/Makefile
index 88a0674f26e3..8484be8ec691 100644
--- a/bin/rmail/Makefile
+++ b/bin/rmail/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.6 1997/02/22 14:05:29 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../contrib/sendmail/rmail
 
diff --git a/bin/rmdir/Makefile b/bin/rmdir/Makefile
index 4bedbff9d478..c2c7f301ce49 100644
--- a/bin/rmdir/Makefile
+++ b/bin/rmdir/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	rmdir
 
diff --git a/bin/rmdir/rmdir.1 b/bin/rmdir/rmdir.1
index 086ad3acdfd9..a6a247873b5b 100644
--- a/bin/rmdir/rmdir.1
+++ b/bin/rmdir/rmdir.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rmdir.1	8.1 (Berkeley) 5/31/93
-.\"	$Id: rmdir.1,v 1.6 1997/02/22 14:05:37 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 31, 1993
 .Dt RMDIR 1
diff --git a/bin/rmdir/rmdir.c b/bin/rmdir/rmdir.c
index 6b31c5a588f6..4be8427b2eab 100644
--- a/bin/rmdir/rmdir.c
+++ b/bin/rmdir/rmdir.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)rmdir.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/bin/sh/Makefile b/bin/sh/Makefile
index fc1afd4de939..1a88934858d3 100644
--- a/bin/sh/Makefile
+++ b/bin/sh/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.4 (Berkeley) 5/5/95
-#	$Id: Makefile,v 1.27 1998/05/06 15:33:59 bde Exp $
+# $FreeBSD$
 
 PROG=	sh
 SHSRCS=	alias.c arith.y arith_lex.l cd.c echo.c error.c eval.c exec.c expand.c \
diff --git a/bin/sh/TOUR b/bin/sh/TOUR
index e7bc2c43c7bb..5a0b76b7ea90 100644
--- a/bin/sh/TOUR
+++ b/bin/sh/TOUR
@@ -1,5 +1,5 @@
 #	@(#)TOUR	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 NOTE -- This is the original TOUR paper distributed with ash and
 does not represent the current state of the shell.  It is provided anyway
diff --git a/bin/sh/alias.c b/bin/sh/alias.c
index a02d12b06e41..2d605ec59196 100644
--- a/bin/sh/alias.c
+++ b/bin/sh/alias.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)alias.c	8.3 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: alias.c,v 1.10 1998/05/18 06:43:25 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/bin/sh/alias.h b/bin/sh/alias.h
index 4feb75267338..a282a6976703 100644
--- a/bin/sh/alias.h
+++ b/bin/sh/alias.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)alias.h	8.2 (Berkeley) 5/4/95
- *	$Id$
+ * $FreeBSD$
  */
 
 #define ALIASINUSE	1
diff --git a/bin/sh/arith.h b/bin/sh/arith.h
index 34eb73c19251..c58cd3c7cb5c 100644
--- a/bin/sh/arith.h
+++ b/bin/sh/arith.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)arith.h	1.1 (Berkeley) 5/4/95
- *	$Id$
+ * $FreeBSD$
  */
 
 int arith __P((char *));
diff --git a/bin/sh/arith.y b/bin/sh/arith.y
index 655ed234f0ac..6d5bf95ce1bc 100644
--- a/bin/sh/arith.y
+++ b/bin/sh/arith.y
@@ -88,7 +88,7 @@ expr:	ARITH_LPAREN expr ARITH_RPAREN = { $$ = $2; }
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: arith.y,v 1.8 1998/08/24 10:20:36 cracauer Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -96,7 +96,7 @@ expr:	ARITH_LPAREN expr ARITH_RPAREN = { $$ = $2; }
 static char sccsid[] = "@(#)arith.y	8.3 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "shell.h"
diff --git a/bin/sh/arith_lex.l b/bin/sh/arith_lex.l
index ef29c1222996..8b855bd78121 100644
--- a/bin/sh/arith_lex.l
+++ b/bin/sh/arith_lex.l
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: arith_lex.l,v 1.12 1998/08/25 09:33:34 cracauer Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -42,7 +42,7 @@
 static char sccsid[] = "@(#)arith_lex.l	8.3 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: arith_lex.l,v 1.12 1998/08/25 09:33:34 cracauer Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <unistd.h>
diff --git a/bin/sh/bltin/bltin.h b/bin/sh/bltin/bltin.h
index ebd035a650de..a96c4761006d 100644
--- a/bin/sh/bltin/bltin.h
+++ b/bin/sh/bltin/bltin.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)bltin.h	8.2 (Berkeley) 5/4/95
- *	$Id: bltin.h,v 1.8 1997/02/22 13:58:58 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/bin/sh/bltin/echo.1 b/bin/sh/bltin/echo.1
index b54ce3a8268b..a2f57f3d8048 100644
--- a/bin/sh/bltin/echo.1
+++ b/bin/sh/bltin/echo.1
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.2 (Berkeley) 5/4/95
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 4, 1995
 .Dt ECHO 1
diff --git a/bin/sh/bltin/echo.c b/bin/sh/bltin/echo.c
index f0829056d57d..8ce088ad060e 100644
--- a/bin/sh/bltin/echo.c
+++ b/bin/sh/bltin/echo.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)echo.c	8.2 (Berkeley) 5/4/95
- *	$Id: echo.c,v 1.7 1997/02/22 13:58:59 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/bin/sh/builtins.def b/bin/sh/builtins.def
index b34aa9cbc639..7cdcc38683aa 100644
--- a/bin/sh/builtins.def
+++ b/bin/sh/builtins.def
@@ -35,7 +35,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)builtins.def	8.4 (Berkeley) 5/4/95
-#	$Id: builtins.def,v 1.5 1997/02/22 13:58:22 peter Exp $
+# $FreeBSD$
 
 #
 # This file lists all the builtin commands.  The first column is the name
diff --git a/bin/sh/cd.c b/bin/sh/cd.c
index 12e78bff5aff..ee658929c8f8 100644
--- a/bin/sh/cd.c
+++ b/bin/sh/cd.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)cd.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: cd.c,v 1.17 1998/05/18 06:43:30 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/sh/cd.h b/bin/sh/cd.h
index 673ccdc2f716..078b40efe61d 100644
--- a/bin/sh/cd.h
+++ b/bin/sh/cd.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: cd.h,v 1.3 1997/12/29 00:00:10 alex Exp $
+ * $FreeBSD$
  */
 
 char	*getpwd __P((void));
diff --git a/bin/sh/error.c b/bin/sh/error.c
index db0cf5d24ac5..f5dd6a689ef9 100644
--- a/bin/sh/error.c
+++ b/bin/sh/error.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)error.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: error.c,v 1.12 1998/08/24 19:15:48 cracauer Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/bin/sh/error.h b/bin/sh/error.h
index fe6e25ea191f..6c58c123373d 100644
--- a/bin/sh/error.h
+++ b/bin/sh/error.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)error.h	8.2 (Berkeley) 5/4/95
- *	$Id: error.h,v 1.9 1998/08/24 19:15:48 cracauer Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/bin/sh/eval.c b/bin/sh/eval.c
index 4c762bad3e56..341fbab16f06 100644
--- a/bin/sh/eval.c
+++ b/bin/sh/eval.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)eval.c	8.9 (Berkeley) 6/8/95";
 #endif
 static const char rcsid[] =
-	"$Id: eval.c,v 1.19 1999/05/08 10:21:46 kris Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <signal.h>
diff --git a/bin/sh/eval.h b/bin/sh/eval.h
index 46a6820739e3..4f0b8988cae3 100644
--- a/bin/sh/eval.h
+++ b/bin/sh/eval.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)eval.h	8.2 (Berkeley) 5/4/95
- *	$Id$
+ * $FreeBSD$
  */
 
 extern char *commandname;	/* currently executing command */
diff --git a/bin/sh/exec.c b/bin/sh/exec.c
index 30c083434caa..3bfdba5eb984 100644
--- a/bin/sh/exec.c
+++ b/bin/sh/exec.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)exec.c	8.4 (Berkeley) 6/8/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/sh/exec.h b/bin/sh/exec.h
index ab655ff04752..5b8e5e4657cc 100644
--- a/bin/sh/exec.h
+++ b/bin/sh/exec.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.3 (Berkeley) 6/8/95
- *	$Id: exec.h,v 1.6 1997/02/22 13:58:25 peter Exp $
+ * $FreeBSD$
  */
 
 /* values of cmdtype */
diff --git a/bin/sh/expand.c b/bin/sh/expand.c
index e661be656e94..c6102aaeaa3e 100644
--- a/bin/sh/expand.c
+++ b/bin/sh/expand.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)expand.c	8.5 (Berkeley) 5/15/95";
 #endif
 static const char rcsid[] =
-	"$Id: expand.c,v 1.27 1999/04/21 11:52:39 cracauer Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/sh/expand.h b/bin/sh/expand.h
index eec98852250e..955b8bf424e7 100644
--- a/bin/sh/expand.h
+++ b/bin/sh/expand.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)expand.h	8.2 (Berkeley) 5/4/95
- *	$Id: expand.h,v 1.7 1998/09/13 19:24:57 tegge Exp $
+ * $FreeBSD$
  */
 
 struct strlist {
diff --git a/bin/sh/funcs/cmv b/bin/sh/funcs/cmv
index ec67c471a115..6e9dcff9c088 100644
--- a/bin/sh/funcs/cmv
+++ b/bin/sh/funcs/cmv
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)cmv	8.2 (Berkeley) 5/4/95
-#	$Id$
+# $FreeBSD$
 
 # Conditional move--don't replace an existing file.
 
diff --git a/bin/sh/funcs/dirs b/bin/sh/funcs/dirs
index 86984250baf2..a5d3c8e7eeff 100644
--- a/bin/sh/funcs/dirs
+++ b/bin/sh/funcs/dirs
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)dirs	8.2 (Berkeley) 5/4/95
-#	$Id$
+# $FreeBSD$
 
 # pushd, popd, and dirs --- written by Chris Bertin
 # Pixel Computer Inc. ...!wjh12!pixel!pixutl!chris
diff --git a/bin/sh/funcs/kill b/bin/sh/funcs/kill
index f933ce303d58..7455571f8b98 100644
--- a/bin/sh/funcs/kill
+++ b/bin/sh/funcs/kill
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)kill	8.2 (Berkeley) 5/4/95
-#	$Id$
+# $FreeBSD$
 
 # Convert job names to process ids and then run /bin/kill.
 
diff --git a/bin/sh/funcs/login b/bin/sh/funcs/login
index bfed5c26dbe0..7a6fc855bfc2 100644
--- a/bin/sh/funcs/login
+++ b/bin/sh/funcs/login
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)login	8.2 (Berkeley) 5/4/95
-#	$Id$
+# $FreeBSD$
 
 # replaces the login builtin in the BSD shell
 login () exec login "$@"
diff --git a/bin/sh/funcs/newgrp b/bin/sh/funcs/newgrp
index bc84261f7e53..fd8e5d6ee5a7 100644
--- a/bin/sh/funcs/newgrp
+++ b/bin/sh/funcs/newgrp
@@ -33,6 +33,6 @@
 # SUCH DAMAGE.
 #
 #	@(#)newgrp	8.2 (Berkeley) 5/4/95
-#	$Id$
+# $FreeBSD$
 
 newgrp() exec newgrp "$@"
diff --git a/bin/sh/funcs/popd b/bin/sh/funcs/popd
index a495dbb51e10..e0be35a13a79 100644
--- a/bin/sh/funcs/popd
+++ b/bin/sh/funcs/popd
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)popd	8.2 (Berkeley) 5/4/95
-#	$Id$
+# $FreeBSD$
 
 # pushd, popd, and dirs --- written by Chris Bertin
 # Pixel Computer Inc. ...!wjh12!pixel!pixutl!chris
diff --git a/bin/sh/funcs/pushd b/bin/sh/funcs/pushd
index 0a50f40d4a9c..d60ede2cbbcc 100644
--- a/bin/sh/funcs/pushd
+++ b/bin/sh/funcs/pushd
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)pushd	8.2 (Berkeley) 5/4/95
-#	$Id$
+# $FreeBSD$
 
 # pushd, popd, and dirs --- written by Chris Bertin
 # Pixel Computer Inc. ...!wjh12!pixel!pixutl!chris
diff --git a/bin/sh/funcs/suspend b/bin/sh/funcs/suspend
index d60614ff4a08..f06e12ff0575 100644
--- a/bin/sh/funcs/suspend
+++ b/bin/sh/funcs/suspend
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)suspend	8.2 (Berkeley) 5/4/95
-#	$Id$
+# $FreeBSD$
 
 suspend() {
 	local -
diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c
index 1a5dd5278ac7..798118b90a61 100644
--- a/bin/sh/histedit.c
+++ b/bin/sh/histedit.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)histedit.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/bin/sh/init.h b/bin/sh/init.h
index d02b50edadd6..366b8a3f376d 100644
--- a/bin/sh/init.h
+++ b/bin/sh/init.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)init.h	8.2 (Berkeley) 5/4/95
- *	$Id$
+ * $FreeBSD$
  */
 
 void init __P((void));
diff --git a/bin/sh/input.c b/bin/sh/input.c
index f44749c6d799..809a335d552a 100644
--- a/bin/sh/input.c
+++ b/bin/sh/input.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)input.c	8.3 (Berkeley) 6/9/95";
 #endif
 static const char rcsid[] =
-	"$Id: input.c,v 1.11 1998/05/18 06:43:45 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>	/* defines BUFSIZ */
diff --git a/bin/sh/input.h b/bin/sh/input.h
index a9f87dd5927d..16d7244cd4e7 100644
--- a/bin/sh/input.h
+++ b/bin/sh/input.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)input.h	8.2 (Berkeley) 5/4/95
- *	$Id$
+ * $FreeBSD$
  */
 
 /* PEOF (the end of file marker) is defined in syntax.h */
diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c
index ce1785bbe758..d33e74cc0b50 100644
--- a/bin/sh/jobs.c
+++ b/bin/sh/jobs.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)jobs.c	8.5 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: jobs.c,v 1.24 1999/04/21 11:52:39 cracauer Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <fcntl.h>
diff --git a/bin/sh/jobs.h b/bin/sh/jobs.h
index 4a39df2704cf..e8274b08f0ff 100644
--- a/bin/sh/jobs.h
+++ b/bin/sh/jobs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)jobs.h	8.2 (Berkeley) 5/4/95
- *	$Id: jobs.h,v 1.10 1998/09/10 22:09:11 cracauer Exp $
+ * $FreeBSD$
  */
 
 /* Mode argument to forkshell.  Don't change FORK_FG or FORK_BG. */
diff --git a/bin/sh/machdep.h b/bin/sh/machdep.h
index a0928958de70..20aadd04180a 100644
--- a/bin/sh/machdep.h
+++ b/bin/sh/machdep.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)machdep.h	8.2 (Berkeley) 5/4/95
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/bin/sh/mail.c b/bin/sh/mail.c
index 965f69dde396..826e89a31e8f 100644
--- a/bin/sh/mail.c
+++ b/bin/sh/mail.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)mail.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/bin/sh/mail.h b/bin/sh/mail.h
index c787024c6b06..319796b13eef 100644
--- a/bin/sh/mail.h
+++ b/bin/sh/mail.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mail.h	8.2 (Berkeley) 5/4/95
- *	$Id$
+ * $FreeBSD$
  */
 
 void chkmail __P((int));
diff --git a/bin/sh/main.c b/bin/sh/main.c
index f91f1abe60f5..3a15230e1240 100644
--- a/bin/sh/main.c
+++ b/bin/sh/main.c
@@ -45,7 +45,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.15 1998/05/18 06:43:52 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/bin/sh/main.h b/bin/sh/main.h
index ed3391a488ed..3dc3dd77c4d7 100644
--- a/bin/sh/main.h
+++ b/bin/sh/main.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)main.h	8.2 (Berkeley) 5/4/95
- *	$Id$
+ * $FreeBSD$
  */
 
 extern int rootpid;	/* pid of main shell */
diff --git a/bin/sh/memalloc.c b/bin/sh/memalloc.c
index 858d567324cf..b2155ffaa1d9 100644
--- a/bin/sh/memalloc.c
+++ b/bin/sh/memalloc.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)memalloc.c	8.3 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: memalloc.c,v 1.13 1999/04/12 14:23:36 cracauer Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "shell.h"
diff --git a/bin/sh/memalloc.h b/bin/sh/memalloc.h
index b3aec71dc255..ab53a833e41a 100644
--- a/bin/sh/memalloc.h
+++ b/bin/sh/memalloc.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)memalloc.h	8.2 (Berkeley) 5/4/95
- *	$Id$
+ * $FreeBSD$
  */
 
 struct stackmark {
diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c
index a270ac8b5ab8..24683572aab7 100644
--- a/bin/sh/miscbltin.c
+++ b/bin/sh/miscbltin.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)miscbltin.c	8.4 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: miscbltin.c,v 1.19 1999/05/08 10:21:56 kris Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/bin/sh/mkbuiltins b/bin/sh/mkbuiltins
index 37ebf8310360..89f50d279b92 100755
--- a/bin/sh/mkbuiltins
+++ b/bin/sh/mkbuiltins
@@ -35,7 +35,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)mkbuiltins	8.2 (Berkeley) 5/4/95
-#	$Id$
+# $FreeBSD$
 
 temp=/tmp/ka$$
 havejobs=0
diff --git a/bin/sh/mkinit.c b/bin/sh/mkinit.c
index fc1307cabe5a..e6de2d2fb245 100644
--- a/bin/sh/mkinit.c
+++ b/bin/sh/mkinit.c
@@ -45,7 +45,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)mkinit.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/bin/sh/mknodes.c b/bin/sh/mknodes.c
index f1fe5ee0dfba..615668b3733a 100644
--- a/bin/sh/mknodes.c
+++ b/bin/sh/mknodes.c
@@ -45,7 +45,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)mknodes.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/bin/sh/mksyntax.c b/bin/sh/mksyntax.c
index 33f5ea8d9d2f..8e4ab082c712 100644
--- a/bin/sh/mksyntax.c
+++ b/bin/sh/mksyntax.c
@@ -45,7 +45,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)mksyntax.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: mksyntax.c,v 1.11 1998/05/18 06:44:03 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/bin/sh/mktokens b/bin/sh/mktokens
index 667ccf4ea2a7..172bb23d4968 100644
--- a/bin/sh/mktokens
+++ b/bin/sh/mktokens
@@ -35,7 +35,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)mktokens	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 # The following is a list of tokens.  The second column is nonzero if the
 # token marks the end of a list.  The third column is the name to print in
diff --git a/bin/sh/myhistedit.h b/bin/sh/myhistedit.h
index 3a57c97cafdf..e60bf5a43d0c 100644
--- a/bin/sh/myhistedit.h
+++ b/bin/sh/myhistedit.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)myhistedit.h	8.2 (Berkeley) 5/4/95
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <histedit.h>
diff --git a/bin/sh/mystring.c b/bin/sh/mystring.c
index b960bdc11c41..8013f7da6a7a 100644
--- a/bin/sh/mystring.c
+++ b/bin/sh/mystring.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)mystring.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/bin/sh/mystring.h b/bin/sh/mystring.h
index 8471b3e566de..4a78bd9de5ee 100644
--- a/bin/sh/mystring.h
+++ b/bin/sh/mystring.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mystring.h	8.2 (Berkeley) 5/4/95
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <string.h>
diff --git a/bin/sh/nodes.c.pat b/bin/sh/nodes.c.pat
index 60e5bf5c6229..526cd88610d0 100644
--- a/bin/sh/nodes.c.pat
+++ b/bin/sh/nodes.c.pat
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nodes.c.pat	8.2 (Berkeley) 5/4/95
- *	$Id: nodes.c.pat,v 1.5 1997/02/22 13:58:39 peter Exp $
+ * $FreeBSD$
  */
 
 #include <stdlib.h>
diff --git a/bin/sh/nodetypes b/bin/sh/nodetypes
index 4f909cfb0b81..ce82a35d266f 100644
--- a/bin/sh/nodetypes
+++ b/bin/sh/nodetypes
@@ -34,7 +34,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)nodetypes	8.2 (Berkeley) 5/4/95
-#	$Id$
+# $FreeBSD$
 
 # This file describes the nodes used in parse trees.  Unindented lines
 # contain a node type followed by a structure tag.  Subsequent indented
diff --git a/bin/sh/options.c b/bin/sh/options.c
index 0b65645913b9..2bd55f5030e7 100644
--- a/bin/sh/options.c
+++ b/bin/sh/options.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)options.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <signal.h>
diff --git a/bin/sh/options.h b/bin/sh/options.h
index 907cab2a4645..e28370364df7 100644
--- a/bin/sh/options.h
+++ b/bin/sh/options.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)options.h	8.2 (Berkeley) 5/4/95
- *	$Id: options.h,v 1.7 1997/02/22 13:58:40 peter Exp $
+ * $FreeBSD$
  */
 
 struct shparam {
diff --git a/bin/sh/output.c b/bin/sh/output.c
index 1421b4660dac..82ae3803774f 100644
--- a/bin/sh/output.c
+++ b/bin/sh/output.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)output.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/bin/sh/output.h b/bin/sh/output.h
index 59798198f7ba..f99db6b81b8b 100644
--- a/bin/sh/output.h
+++ b/bin/sh/output.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)output.h	8.2 (Berkeley) 5/4/95
- *	$Id: output.h,v 1.6 1997/02/22 13:58:41 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef OUTPUT_INCL
diff --git a/bin/sh/parser.c b/bin/sh/parser.c
index ba60254e367b..c73dbc289a67 100644
--- a/bin/sh/parser.c
+++ b/bin/sh/parser.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)parser.c	8.7 (Berkeley) 5/16/95";
 #endif
 static const char rcsid[] =
-	"$Id: parser.c,v 1.23 1998/09/06 21:13:09 tegge Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/bin/sh/parser.h b/bin/sh/parser.h
index 8671ecaa84eb..fdb2c342bbda 100644
--- a/bin/sh/parser.h
+++ b/bin/sh/parser.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)parser.h	8.3 (Berkeley) 5/4/95
- *	$Id: parser.h,v 1.6 1997/02/22 13:58:42 peter Exp $
+ * $FreeBSD$
  */
 
 /* control characters in argument strings */
diff --git a/bin/sh/redir.c b/bin/sh/redir.c
index aa1b7c8dcf4d..79b70d05840f 100644
--- a/bin/sh/redir.c
+++ b/bin/sh/redir.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)redir.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/sh/redir.h b/bin/sh/redir.h
index 9db3441f3b87..709ed12326f5 100644
--- a/bin/sh/redir.h
+++ b/bin/sh/redir.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)redir.h	8.2 (Berkeley) 5/4/95
- *	$Id$
+ * $FreeBSD$
  */
 
 /* flags passed to redirect */
diff --git a/bin/sh/sh.1 b/bin/sh/sh.1
index 66baae6a56b5..3c7e4f581f2d 100644
--- a/bin/sh/sh.1
+++ b/bin/sh/sh.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
-.\"	$Id: sh.1,v 1.28 1999/04/19 18:48:26 max Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 5, 1995
 .Dt SH 1
diff --git a/bin/sh/shell.h b/bin/sh/shell.h
index eb9b73da5cbc..5939df776c2a 100644
--- a/bin/sh/shell.h
+++ b/bin/sh/shell.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)shell.h	8.2 (Berkeley) 5/4/95
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/bin/sh/show.c b/bin/sh/show.c
index b49c14795aff..620ffa4bcfd6 100644
--- a/bin/sh/show.c
+++ b/bin/sh/show.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)show.c	8.3 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/bin/sh/show.h b/bin/sh/show.h
index eb278eed6e74..1b6cbbc21296 100644
--- a/bin/sh/show.h
+++ b/bin/sh/show.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)show.h	1.1 (Berkeley) 5/4/95
- *	$Id: show.h,v 1.5 1997/02/22 13:58:46 peter Exp $
+ * $FreeBSD$
  */
 
 void showtree __P((union node *));
diff --git a/bin/sh/trap.c b/bin/sh/trap.c
index 2a6b88af5da2..233746e6b5fa 100644
--- a/bin/sh/trap.c
+++ b/bin/sh/trap.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)trap.c	8.5 (Berkeley) 6/5/95";
 #endif
 static const char rcsid[] =
-	"$Id: trap.c,v 1.18 1999/04/01 13:27:36 cracauer Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <signal.h>
diff --git a/bin/sh/trap.h b/bin/sh/trap.h
index 132b6eef40db..2140c1460499 100644
--- a/bin/sh/trap.h
+++ b/bin/sh/trap.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)trap.h	8.3 (Berkeley) 6/5/95
- *	$Id: trap.h,v 1.7 1997/11/10 11:32:24 bde Exp $
+ * $FreeBSD$
  */
 
 extern int pendingsigs;
diff --git a/bin/sh/var.c b/bin/sh/var.c
index eea73c7d2911..056ae6fcfe59 100644
--- a/bin/sh/var.c
+++ b/bin/sh/var.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: var.c,v 1.13 1999/04/03 11:41:46 cracauer Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <unistd.h>
diff --git a/bin/sh/var.h b/bin/sh/var.h
index 42e43919bb20..1a215fc806db 100644
--- a/bin/sh/var.h
+++ b/bin/sh/var.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)var.h	8.2 (Berkeley) 5/4/95
- *	$Id: var.h,v 1.6 1997/02/22 13:58:48 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/bin/sleep/Makefile b/bin/sleep/Makefile
index 163470fb3bd0..4ff73308c45b 100644
--- a/bin/sleep/Makefile
+++ b/bin/sleep/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	sleep
 
diff --git a/bin/sleep/sleep.1 b/bin/sleep/sleep.1
index f0ed6310d486..237b57401463 100644
--- a/bin/sleep/sleep.1
+++ b/bin/sleep/sleep.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sleep.1	8.3 (Berkeley) 4/18/94
-.\"	$Id: sleep.1,v 1.10 1999/08/09 17:31:30 ru Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt SLEEP 1
diff --git a/bin/sleep/sleep.c b/bin/sleep/sleep.c
index 58f3bc8f876b..74242c977d71 100644
--- a/bin/sleep/sleep.c
+++ b/bin/sleep/sleep.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)sleep.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/bin/stty/Makefile b/bin/stty/Makefile
index d0b160d74b03..82b15eb7fcae 100644
--- a/bin/stty/Makefile
+++ b/bin/stty/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	stty
 SRCS=	cchar.c gfmt.c key.c modes.c print.c stty.c util.c
diff --git a/bin/stty/cchar.c b/bin/stty/cchar.c
index f9e6e708447c..847cf749e0ac 100644
--- a/bin/stty/cchar.c
+++ b/bin/stty/cchar.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cchar.c	8.5 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/stty/extern.h b/bin/stty/extern.h
index aa7a35b13d27..27869f852dfe 100644
--- a/bin/stty/extern.h
+++ b/bin/stty/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 int	c_cchars __P((const void *, const void *));
diff --git a/bin/stty/gfmt.c b/bin/stty/gfmt.c
index 4ebd2e972a9d..b34a1179f475 100644
--- a/bin/stty/gfmt.c
+++ b/bin/stty/gfmt.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)gfmt.c	8.6 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: gfmt.c,v 1.8 1998/05/18 06:48:13 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/stty/key.c b/bin/stty/key.c
index aeeeb9c20e70..ba33a81c405f 100644
--- a/bin/stty/key.c
+++ b/bin/stty/key.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)key.c	8.3 (Berkeley) 4/2/94";
 #else
 static const char rcsid[] =
-	"$Id: key.c,v 1.9 1997/08/24 00:26:12 steve Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/bin/stty/modes.c b/bin/stty/modes.c
index 83eec2a517d1..b1f333e1013f 100644
--- a/bin/stty/modes.c
+++ b/bin/stty/modes.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)modes.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/stty/print.c b/bin/stty/print.c
index 8f4f0132f640..ce479f55e381 100644
--- a/bin/stty/print.c
+++ b/bin/stty/print.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)print.c	8.6 (Berkeley) 4/16/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/stty/stty.1 b/bin/stty/stty.1
index 1862791c13aa..335c50321ed2 100644
--- a/bin/stty/stty.1
+++ b/bin/stty/stty.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)stty.1	8.4 (Berkeley) 4/18/94
-.\"	$Id: stty.1,v 1.10 1998/06/03 04:07:59 jkoshy Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt STTY 1
diff --git a/bin/stty/stty.c b/bin/stty/stty.c
index b2965a86ba0e..3b5913134656 100644
--- a/bin/stty/stty.c
+++ b/bin/stty/stty.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)stty.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/stty/stty.h b/bin/stty/stty.h
index 2b822d6a8fb8..e122979d799d 100644
--- a/bin/stty/stty.h
+++ b/bin/stty/stty.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stty.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/ioctl.h>
diff --git a/bin/stty/util.c b/bin/stty/util.c
index f54ac42dc053..b99e83f67d96 100644
--- a/bin/stty/util.c
+++ b/bin/stty/util.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/bin/sync/Makefile b/bin/sync/Makefile
index 0656381fd00c..9698a64dcd0d 100644
--- a/bin/sync/Makefile
+++ b/bin/sync/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	sync
 MAN8=	sync.8
diff --git a/bin/sync/sync.8 b/bin/sync/sync.8
index 198de51d8ac4..36b017f9edc4 100644
--- a/bin/sync/sync.8
+++ b/bin/sync/sync.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sync.8	8.1 (Berkeley) 5/31/93
-.\"	$Id: sync.8,v 1.6 1997/02/22 14:06:06 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 31, 1993
 .Dt SYNC 8
diff --git a/bin/sync/sync.c b/bin/sync/sync.c
index dbc3cdea876a..6fe316022702 100644
--- a/bin/sync/sync.c
+++ b/bin/sync/sync.c
@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)sync.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <unistd.h>
diff --git a/bin/test/Makefile b/bin/test/Makefile
index 5b1f2e13ba1f..c1bc62c5fc6e 100644
--- a/bin/test/Makefile
+++ b/bin/test/Makefile
@@ -1,5 +1,5 @@
 #        @(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.4 1997/02/22 14:06:17 peter Exp $
+# $FreeBSD$
 
 PROG=	test
 LINKS=	${BINDIR}/test ${BINDIR}/[
diff --git a/bin/test/TEST.README b/bin/test/TEST.README
index 7bec57dc7d60..f29195374968 100644
--- a/bin/test/TEST.README
+++ b/bin/test/TEST.README
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 OS/shell			syntax error	failed
 --------------------------------------------------------------------
diff --git a/bin/test/TEST.csh b/bin/test/TEST.csh
index b18fefbaf940..afa1c91f158a 100644
--- a/bin/test/TEST.csh
+++ b/bin/test/TEST.csh
@@ -1,5 +1,5 @@
 #	@(#)TEST.csh	5.2 (Berkeley) 4/30/93
-#	$Id$
+# $FreeBSD$
 
 #alias t '/usr/src/bin/test/obj/test \!*; echo $status'
 alias t '/bin/test \!*; echo $status'
diff --git a/bin/test/TEST.sh b/bin/test/TEST.sh
index 331c1ce633a3..148cba25624a 100644
--- a/bin/test/TEST.sh
+++ b/bin/test/TEST.sh
@@ -26,7 +26,7 @@
 #
 # TEST.sh - check if test(1) or builtin test works
 #
-# $Id$
+# $FreeBSD$
 
 # force a specified test program, e.g. `env test=/bin/test sh TEST.sh'
 : ${test=test}		
diff --git a/bin/test/test.1 b/bin/test/test.1
index bfe342b16318..cfd9ff7fc8fb 100644
--- a/bin/test/test.1
+++ b/bin/test/test.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)test.1	8.1 (Berkeley) 5/31/93
-.\"	$Id: test.1,v 1.8 1998/12/18 03:16:47 jkoshy Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 31, 1993
 .Dt TEST 1
diff --git a/bin/test/test.c b/bin/test/test.c
index 35af0442ce13..e02559d3df72 100644
--- a/bin/test/test.c
+++ b/bin/test/test.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: test.c,v 1.26 1999/08/22 22:32:41 green Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/lib/libc/gen/setflags.c b/lib/libc/gen/setflags.c
index f8472966fdfd..5235eb31ffa6 100644
--- a/lib/libc/gen/setflags.c
+++ b/lib/libc/gen/setflags.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)stat_flags.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: stat_flags.c,v 1.9 1998/01/09 06:14:59 jb Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/lib/libc/gen/setflagsbyname.c b/lib/libc/gen/setflagsbyname.c
index f8472966fdfd..5235eb31ffa6 100644
--- a/lib/libc/gen/setflagsbyname.c
+++ b/lib/libc/gen/setflagsbyname.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)stat_flags.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: stat_flags.c,v 1.9 1998/01/09 06:14:59 jb Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/lib/libc/gen/strtofflags.c b/lib/libc/gen/strtofflags.c
index f8472966fdfd..5235eb31ffa6 100644
--- a/lib/libc/gen/strtofflags.c
+++ b/lib/libc/gen/strtofflags.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)stat_flags.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: stat_flags.c,v 1.9 1998/01/09 06:14:59 jb Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/lib/libutil/stat_flags.c b/lib/libutil/stat_flags.c
index f8472966fdfd..5235eb31ffa6 100644
--- a/lib/libutil/stat_flags.c
+++ b/lib/libutil/stat_flags.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)stat_flags.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: stat_flags.c,v 1.9 1998/01/09 06:14:59 jb Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */