$Id$ -> $FreeBSD$

795 files changed, 807 insertions, 807 deletions

diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index ff5f87564dae..f03d0cd658ff 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 1/7/94
-#	$Id: Makefile,v 1.127 1999/04/18 15:56:20 peter Exp $
+# $FreeBSD$
 
 # XXX MISSING:		deroff diction graph learn plot
 #			spell spline struct xsend
diff --git a/usr.bin/apply/apply.1 b/usr.bin/apply/apply.1
index 5c69684fff41..4631cdb1b92c 100644
--- a/usr.bin/apply/apply.1
+++ b/usr.bin/apply/apply.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)apply.1	8.2 (Berkeley) 4/4/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1994
 .Dt APPLY 1
diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile
index 7392d139db4d..af3161251965 100644
--- a/usr.bin/ar/Makefile
+++ b/usr.bin/ar/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.7 1998/10/10 12:48:48 bde Exp $
+# $FreeBSD$
 
 PROG=	ar
 CFLAGS+=-I${.CURDIR} -Wall
diff --git a/usr.bin/ar/ar.1 b/usr.bin/ar/ar.1
index e9118e7f2e54..3741299cb8ae 100644
--- a/usr.bin/ar/ar.1
+++ b/usr.bin/ar/ar.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ar.1	8.1 (Berkeley) 6/29/93
-.\"	$Id: ar.1,v 1.4 1997/02/22 19:54:01 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 29, 1993
 .Dt AR 1
diff --git a/usr.bin/ar/ar.1aout b/usr.bin/ar/ar.1aout
index e9118e7f2e54..3741299cb8ae 100644
--- a/usr.bin/ar/ar.1aout
+++ b/usr.bin/ar/ar.1aout
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ar.1	8.1 (Berkeley) 6/29/93
-.\"	$Id: ar.1,v 1.4 1997/02/22 19:54:01 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 29, 1993
 .Dt AR 1
diff --git a/usr.bin/ar/ar.5 b/usr.bin/ar/ar.5
index 2e3d336c9128..e163cf6cf799 100644
--- a/usr.bin/ar/ar.5
+++ b/usr.bin/ar/ar.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ar.5.5	8.1 (Berkeley) 6/9/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt AR 5
diff --git a/usr.bin/ar/ar.c b/usr.bin/ar/ar.c
index b2c85fc79537..c53c1e44dcfa 100644
--- a/usr.bin/ar/ar.c
+++ b/usr.bin/ar/ar.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ar.c,v 1.6 1997/06/23 06:41:30 charnier Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/at/Makefile b/usr.bin/at/Makefile
index 393af8387875..df96d573b49b 100644
--- a/usr.bin/at/Makefile
+++ b/usr.bin/at/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.8 1998/09/19 22:42:03 obrien Exp $
+# $FreeBSD$
 
 .include "${.CURDIR}/Makefile.inc"
 
diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c
index d21dfd39c92b..017bfdc0f146 100644
--- a/usr.bin/at/at.c
+++ b/usr.bin/at/at.c
@@ -92,7 +92,7 @@ enum { ATQ, ATRM, AT, BATCH, CAT };	/* what program we want to run */
 
 /* File scope variables */
 
-static const char rcsid[] = "$Id: at.c,v 1.15 1998/12/06 07:42:09 archie Exp $";
+static const char rcsid[] = "$FreeBSD$";
 char *no_export[] =
 {
     "TERM", "TERMCAP", "DISPLAY", "_"
diff --git a/usr.bin/at/at.man b/usr.bin/at/at.man
index 02c79306e98e..b6dd8288b65a 100644
--- a/usr.bin/at/at.man
+++ b/usr.bin/at/at.man
@@ -1,4 +1,4 @@
-.\" $Id: at.man,v 1.10 1999/08/15 08:25:13 mpp Exp $
+.\" $FreeBSD$
 .Dd April 12, 1995
 .Dt "AT" 1
 .Os FreeBSD 2.1
diff --git a/usr.bin/at/panic.c b/usr.bin/at/panic.c
index c111dd823384..6098c9501e9e 100644
--- a/usr.bin/at/panic.c
+++ b/usr.bin/at/panic.c
@@ -38,7 +38,7 @@
 /* File scope variables */
 
 static const char rcsid[] =
-	"$Id: panic.c,v 1.7 1997/06/23 06:44:18 charnier Exp $";
+  "$FreeBSD$";
 
 /* External variables */
 
diff --git a/usr.bin/at/parsetime.c b/usr.bin/at/parsetime.c
index dd1fd907de92..df7fe30ea610 100644
--- a/usr.bin/at/parsetime.c
+++ b/usr.bin/at/parsetime.c
@@ -148,7 +148,7 @@ static int sc_tokid;	/* scanner - token id */
 static int sc_tokplur;	/* scanner - is token plural? */
 
 static const char rcsid[] =
-	"$Id: parsetime.c,v 1.16 1998/12/06 07:42:09 archie Exp $";
+  "$FreeBSD$";
 
 /* Local functions */
 
diff --git a/usr.bin/at/perm.c b/usr.bin/at/perm.c
index 398b2a89a741..9c17863c00f3 100644
--- a/usr.bin/at/perm.c
+++ b/usr.bin/at/perm.c
@@ -48,7 +48,7 @@
 
 /* File scope variables */
 
-static const char rcsid[] = "$Id: perm.c,v 1.6 1998/12/06 07:42:09 archie Exp $";
+static const char rcsid[] = "$FreeBSD$";
 
 /* Function declarations */
 
diff --git a/usr.bin/banner/banner.6 b/usr.bin/banner/banner.6
index 2d773715a337..119a3e822c7b 100644
--- a/usr.bin/banner/banner.6
+++ b/usr.bin/banner/banner.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)banner.6	8.2 (Berkeley) 4/29/95
-.\"	$Id: banner.6,v 1.2 1997/08/23 15:49:52 joerg Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 29, 1995
 .Dt BANNER 6
diff --git a/usr.bin/basename/basename.1 b/usr.bin/basename/basename.1
index 697125cc0407..ba95e761270d 100644
--- a/usr.bin/basename/basename.1
+++ b/usr.bin/basename/basename.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)basename.1	8.2 (Berkeley) 4/18/94
-.\"	$Id: basename.1,v 1.4 1997/02/22 19:54:11 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt BASENAME 1
diff --git a/usr.bin/biff/biff.1 b/usr.bin/biff/biff.1
index c0caf75658e2..4b4a2d8a45ee 100644
--- a/usr.bin/biff/biff.1
+++ b/usr.bin/biff/biff.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)biff.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: biff.1,v 1.4 1997/02/22 19:54:13 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt BIFF 1
diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c
index 185d6349167e..606afa8a919d 100644
--- a/usr.bin/biff/biff.c
+++ b/usr.bin/biff/biff.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: biff.c,v 1.4 1997/12/29 00:08:50 alex Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/brandelf/brandelf.1 b/usr.bin/brandelf/brandelf.1
index 0a8099c92522..2c4e82091364 100644
--- a/usr.bin/brandelf/brandelf.1
+++ b/usr.bin/brandelf/brandelf.1
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd February 6, 1997
 .Dt BRANDELF 1
diff --git a/usr.bin/brandelf/brandelf.c b/usr.bin/brandelf/brandelf.c
index 5ad14693a7b7..cea64801f598 100644
--- a/usr.bin/brandelf/brandelf.c
+++ b/usr.bin/brandelf/brandelf.c
@@ -25,7 +25,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: brandelf.c,v 1.10 1998/04/21 02:44:12 eivind Exp $
+ * $FreeBSD$
  */
 
 #include <elf.h>
diff --git a/usr.bin/c89/c89.1 b/usr.bin/c89/c89.1
index 75b4c770d30f..a683df08f43d 100644
--- a/usr.bin/c89/c89.1
+++ b/usr.bin/c89/c89.1
@@ -23,7 +23,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: c89.1,v 1.1.1.1 1997/09/17 20:44:54 joerg Exp $
+.\" $FreeBSD$
 .\" "
 .Dd September 17, 1997
 .Os
diff --git a/usr.bin/c89/c89.sh b/usr.bin/c89/c89.sh
index a9ad3d0c35d0..157fbbff884a 100755
--- a/usr.bin/c89/c89.sh
+++ b/usr.bin/c89/c89.sh
@@ -24,7 +24,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: c89.sh,v 1.2 1997/09/18 20:55:50 joerg Exp $
+# $FreeBSD$
 #
 # This is the Posix.2 mandated C compiler.  Basically, a hook to the
 # cc(1) command.
diff --git a/usr.bin/calendar/calendar.1 b/usr.bin/calendar/calendar.1
index 1f2e5417c1b0..cfe76c4ab782 100644
--- a/usr.bin/calendar/calendar.1
+++ b/usr.bin/calendar/calendar.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)calendar.1  8.1 (Berkeley) 6/29/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 29, 1993
 .Dt CALENDAR 1
diff --git a/usr.bin/calendar/calendars/calendar.all b/usr.bin/calendar/calendars/calendar.all
index 35a40cc1ce79..652829ef863d 100644
--- a/usr.bin/calendar/calendars/calendar.all
+++ b/usr.bin/calendar/calendars/calendar.all
@@ -1,7 +1,7 @@
 /*
  * International and national calendar files
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _calendar_all_
diff --git a/usr.bin/calendar/calendars/calendar.birthday b/usr.bin/calendar/calendars/calendar.birthday
index 10ea34328ca9..06a30c0d5268 100644
--- a/usr.bin/calendar/calendars/calendar.birthday
+++ b/usr.bin/calendar/calendars/calendar.birthday
@@ -1,7 +1,7 @@
 /*
  * Birthday
  *
- * $Id: calendar.birthday,v 1.9 1998/10/22 07:56:22 torstenb Exp $
+ * $FreeBSD$
  */
 
 #ifndef _calendar_birthday_
diff --git a/usr.bin/calendar/calendars/calendar.christian b/usr.bin/calendar/calendars/calendar.christian
index e238918a00cd..d7562f74176d 100644
--- a/usr.bin/calendar/calendars/calendar.christian
+++ b/usr.bin/calendar/calendars/calendar.christian
@@ -1,7 +1,7 @@
 /*
  * Christian
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _calendar_christian_
diff --git a/usr.bin/calendar/calendars/calendar.computer b/usr.bin/calendar/calendars/calendar.computer
index 55fb081f6a89..0b45111acde0 100644
--- a/usr.bin/calendar/calendars/calendar.computer
+++ b/usr.bin/calendar/calendars/calendar.computer
@@ -1,7 +1,7 @@
 /*
  * Computer
  *
- * $Id: calendar.computer,v 1.4 1997/02/22 19:28:19 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _calendar_computer_
diff --git a/usr.bin/calendar/calendars/calendar.croatian b/usr.bin/calendar/calendars/calendar.croatian
index 187a0c7cc2db..af9a55854387 100644
--- a/usr.bin/calendar/calendars/calendar.croatian
+++ b/usr.bin/calendar/calendars/calendar.croatian
@@ -1,7 +1,7 @@
 /*
  * Croatian calendar files
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _calendar_croatian_
diff --git a/usr.bin/calendar/calendars/calendar.german b/usr.bin/calendar/calendars/calendar.german
index 7ee93eb0b9ba..d22207cfd500 100644
--- a/usr.bin/calendar/calendars/calendar.german
+++ b/usr.bin/calendar/calendars/calendar.german
@@ -1,7 +1,7 @@
 /*
  * German calendar file(s)
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _calendar_german_
diff --git a/usr.bin/calendar/calendars/calendar.history b/usr.bin/calendar/calendars/calendar.history
index 1755bedb07d9..ba83c637e4c5 100644
--- a/usr.bin/calendar/calendars/calendar.history
+++ b/usr.bin/calendar/calendars/calendar.history
@@ -1,7 +1,7 @@
 /*
  * History
  *
- * $Id: calendar.history,v 1.7 1997/02/25 01:20:25 mpp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _calendar_history_
diff --git a/usr.bin/calendar/calendars/calendar.holiday b/usr.bin/calendar/calendars/calendar.holiday
index 6da2a1acd7dd..0ae713c1523b 100644
--- a/usr.bin/calendar/calendars/calendar.holiday
+++ b/usr.bin/calendar/calendars/calendar.holiday
@@ -1,7 +1,7 @@
 /*
  * Holiday
  *
- * $Id: calendar.holiday,v 1.6 1997/02/22 19:28:22 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _calendar_holiday_
diff --git a/usr.bin/calendar/calendars/calendar.judaic b/usr.bin/calendar/calendars/calendar.judaic
index e0dfab22a5d9..f1bc9e43e263 100644
--- a/usr.bin/calendar/calendars/calendar.judaic
+++ b/usr.bin/calendar/calendars/calendar.judaic
@@ -1,7 +1,7 @@
 /*
  * Judaic
  *
- * $Id: calendar.judaic,v 1.5 1998/01/19 14:34:53 jgrosch Exp $
+ * $FreeBSD$
  */
 
 #ifndef _calendar_judaic_
diff --git a/usr.bin/calendar/calendars/calendar.music b/usr.bin/calendar/calendars/calendar.music
index 5a60e595d26e..99629ce73c81 100644
--- a/usr.bin/calendar/calendars/calendar.music
+++ b/usr.bin/calendar/calendars/calendar.music
@@ -1,7 +1,7 @@
 /*
  * Music
  *
- * $Id: calendar.music,v 1.6 1997/02/22 19:28:23 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _calendar_music_
diff --git a/usr.bin/calendar/calendars/calendar.russian b/usr.bin/calendar/calendars/calendar.russian
index ce192a0b5198..e308873676c1 100644
--- a/usr.bin/calendar/calendars/calendar.russian
+++ b/usr.bin/calendar/calendars/calendar.russian
@@ -1,7 +1,7 @@
 /*
  * Russian calendar files
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _calendar_russian_
diff --git a/usr.bin/calendar/calendars/calendar.usholiday b/usr.bin/calendar/calendars/calendar.usholiday
index 1d3e45d0b367..712a4b784599 100644
--- a/usr.bin/calendar/calendars/calendar.usholiday
+++ b/usr.bin/calendar/calendars/calendar.usholiday
@@ -1,7 +1,7 @@
 /*
  * USA holiday
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _calendar_usholiday_
diff --git a/usr.bin/calendar/calendars/calendar.world b/usr.bin/calendar/calendars/calendar.world
index 87201392b43a..7e2833b3a5fe 100644
--- a/usr.bin/calendar/calendars/calendar.world
+++ b/usr.bin/calendar/calendars/calendar.world
@@ -1,7 +1,7 @@
 /*
  * World wide calendar files, except national calendars
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _calendar_world_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.all b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.all
index 72068aa760ea..92c0e51ff73e 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.all
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.all
@@ -1,7 +1,7 @@
 /*
  * deutscher Kalender
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_all_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.feiertag b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.feiertag
index d723afa2fa23..4969fc7b7d2d 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.feiertag
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.feiertag
@@ -1,7 +1,7 @@
 /*
  * Feiertage
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_feiertag_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.geschichte b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.geschichte
index 6a2a25e484c8..24d51f61fe57 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.geschichte
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.geschichte
@@ -13,7 +13,7 @@
  * 
  * ISBN 3-924521-59-X
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_geschichte_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.kirche b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.kirche
index efa73245aee0..aa4ef195e74d 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.kirche
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.kirche
@@ -1,7 +1,7 @@
 /*
  * Kirche in Deutschland
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_kirche_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.literatur b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.literatur
index 865e88e988ef..62acab9011a8 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.literatur
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.literatur
@@ -1,7 +1,7 @@
 /*
  * Literatur
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_literatur_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.musik b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.musik
index d08fcd77e5da..ad63646271f6 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.musik
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.musik
@@ -1,7 +1,7 @@
 /*
  * Musik
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_musik_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.wissenschaft b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.wissenschaft
index 87f9c726d51c..175fe0fa4207 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.wissenschaft
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.wissenschaft
@@ -1,7 +1,7 @@
 /*
  * Wissenschaft
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_wissenschaft_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all
index 72068aa760ea..92c0e51ff73e 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all
@@ -1,7 +1,7 @@
 /*
  * deutscher Kalender
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_all_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag
index d723afa2fa23..4969fc7b7d2d 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag
@@ -1,7 +1,7 @@
 /*
  * Feiertage
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_feiertag_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte
index 6a2a25e484c8..24d51f61fe57 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte
@@ -13,7 +13,7 @@
  * 
  * ISBN 3-924521-59-X
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_geschichte_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche
index efa73245aee0..aa4ef195e74d 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche
@@ -1,7 +1,7 @@
 /*
  * Kirche in Deutschland
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_kirche_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur
index 865e88e988ef..62acab9011a8 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur
@@ -1,7 +1,7 @@
 /*
  * Literatur
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_literatur_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik
index d08fcd77e5da..ad63646271f6 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik
@@ -1,7 +1,7 @@
 /*
  * Musik
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_musik_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft
index 87f9c726d51c..175fe0fa4207 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft
@@ -1,7 +1,7 @@
 /*
  * Wissenschaft
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_wissenschaft_
diff --git a/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.all b/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.all
index 17285bd2d3f5..11be34324383 100644
--- a/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.all
+++ b/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.all
@@ -1,7 +1,7 @@
 /*
  *  hrvatski calendar
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _hr_HR_ISO_8859_2_all
diff --git a/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici b/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici
index c1ecd5972175..b78ea99533f8 100644
--- a/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici
+++ b/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici
@@ -1,7 +1,7 @@
 /*
  * hrvatski praznici
  *
- * $Id: calendar.praznici,v 1.4 1997/02/22 19:28:33 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _hr_HR_ISO_8859_2_praznici
diff --git a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all
index 17285bd2d3f5..11be34324383 100644
--- a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all
+++ b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all
@@ -1,7 +1,7 @@
 /*
  *  hrvatski calendar
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _hr_HR_ISO_8859_2_all
diff --git a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici
index c1ecd5972175..b78ea99533f8 100644
--- a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici
+++ b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici
@@ -1,7 +1,7 @@
 /*
  * hrvatski praznici
  *
- * $Id: calendar.praznici,v 1.4 1997/02/22 19:28:33 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _hr_HR_ISO_8859_2_praznici
diff --git a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all
index 89548e84c192..fcdc5e7f8f5e 100644
--- a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all
+++ b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all
@@ -1,7 +1,7 @@
 /*
  * òÕÓÓËÉÊ ËÁÌÅÎÄÁÒØ
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_all
diff --git a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common
index 6bd7764fa82d..2a45b1d2650f 100644
--- a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common
+++ b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common
@@ -1,7 +1,7 @@
 /*
  * òÕÓÓËÉÅ ÐÒÁÚÄÎÉËÉ
  *
- * $Id: calendar.common,v 1.6 1997/05/01 14:39:55 ache Exp $
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_common_
diff --git a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk
index 25c0eef3f577..22de9d3588b7 100644
--- a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk
+++ b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk
@@ -1,7 +1,7 @@
 /*
  * ðÅÒÅ×ÏÄ ÞÁÓÏ× ÄÌÑ ÍÏÓËÏ×ÓËÏÊ ×ÒÅÍÅÎÎÏÊ ÚÏÎÙ
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_msk_
diff --git a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox
index 51ef35baa737..0105343eae8a 100644
--- a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox
+++ b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox
@@ -1,7 +1,7 @@
 /*
  * ðÒÁ×ÏÓÌÁ×ÎÙÅ ÐÒÁÚÄÎÉËÉ
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_orthodox_
diff --git a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan
index 993a32dca5af..c37c993680e9 100644
--- a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan
+++ b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan
@@ -1,7 +1,7 @@
 /*
  * ñÚÙÞÅÓËÉÅ ÐÒÁÚÄÎÉËÉ
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_pagan_
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all
index 89548e84c192..fcdc5e7f8f5e 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all
@@ -1,7 +1,7 @@
 /*
  * òÕÓÓËÉÊ ËÁÌÅÎÄÁÒØ
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_all
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common
index 6bd7764fa82d..2a45b1d2650f 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common
@@ -1,7 +1,7 @@
 /*
  * òÕÓÓËÉÅ ÐÒÁÚÄÎÉËÉ
  *
- * $Id: calendar.common,v 1.6 1997/05/01 14:39:55 ache Exp $
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_common_
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk
index 25c0eef3f577..22de9d3588b7 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk
@@ -1,7 +1,7 @@
 /*
  * ðÅÒÅ×ÏÄ ÞÁÓÏ× ÄÌÑ ÍÏÓËÏ×ÓËÏÊ ×ÒÅÍÅÎÎÏÊ ÚÏÎÙ
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_msk_
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox
index 51ef35baa737..0105343eae8a 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox
@@ -1,7 +1,7 @@
 /*
  * ðÒÁ×ÏÓÌÁ×ÎÙÅ ÐÒÁÚÄÎÉËÉ
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_orthodox_
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan
index 993a32dca5af..c37c993680e9 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan
@@ -1,7 +1,7 @@
 /*
  * ñÚÙÞÅÓËÉÅ ÐÒÁÚÄÎÉËÉ
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_pagan_
diff --git a/usr.bin/calendar/day.c b/usr.bin/calendar/day.c
index d79ff34c855d..cdc367898562 100644
--- a/usr.bin/calendar/day.c
+++ b/usr.bin/calendar/day.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: day.c,v 1.11 1997/10/26 12:51:30 wosch Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c
index 7747fa12e16e..846b96ed5805 100644
--- a/usr.bin/calendar/io.c
+++ b/usr.bin/calendar/io.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: io.c,v 1.10 1997/06/23 06:52:13 charnier Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/calendar/ostern.c b/usr.bin/calendar/ostern.c
index 2527eb0da4b5..12bff9f86e92 100644
--- a/usr.bin/calendar/ostern.c
+++ b/usr.bin/calendar/ostern.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * 	$Id$
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/usr.bin/cap_mkdb/cap_mkdb.1 b/usr.bin/cap_mkdb/cap_mkdb.1
index c7e5dec31776..4cd9ab2c979e 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.1
+++ b/usr.bin/cap_mkdb/cap_mkdb.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cap_mkdb.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: cap_mkdb.1,v 1.4 1997/02/22 19:54:19 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt CAP_MKDB 1
diff --git a/usr.bin/chat/Makefile b/usr.bin/chat/Makefile
index 1154024e846f..2d25d76a12a0 100644
--- a/usr.bin/chat/Makefile
+++ b/usr.bin/chat/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.5 1997/08/22 15:42:31 peter Exp $
+# $FreeBSD$
 
 PROG=	chat
 CFLAGS+=-Wall
diff --git a/usr.bin/chat/chat.8 b/usr.bin/chat/chat.8
index 26ef735b53c9..efcf1948c09d 100644
--- a/usr.bin/chat/chat.8
+++ b/usr.bin/chat/chat.8
@@ -1,6 +1,6 @@
 .\" -*- nroff -*-
 .\" manual page [] for chat 1.8
-.\" $Id: chat.8,v 1.11 1998/06/03 04:21:36 jkoshy Exp $
+.\" $FreeBSD$
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
diff --git a/usr.bin/chat/chat.c b/usr.bin/chat/chat.c
index c25b8cfd8775..217dc303767f 100644
--- a/usr.bin/chat/chat.c
+++ b/usr.bin/chat/chat.c
@@ -79,7 +79,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: chat.c,v 1.12 1998/06/23 21:58:41 peter Exp $";
+  "$FreeBSD$";
 #endif
 
 #include <stdio.h>
diff --git a/usr.bin/checknr/checknr.1 b/usr.bin/checknr/checknr.1
index 8d2eefafb80f..928b905dc546 100644
--- a/usr.bin/checknr/checknr.1
+++ b/usr.bin/checknr/checknr.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)checknr.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt CHECKNR 1
diff --git a/usr.bin/chflags/chflags.1 b/usr.bin/chflags/chflags.1
index 99424f8a437b..1af45709cbdc 100644
--- a/usr.bin/chflags/chflags.1
+++ b/usr.bin/chflags/chflags.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chflags.1	8.2 (Berkeley) 3/31/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd March 31, 1994
 .Dt CHFLAGS 1
diff --git a/usr.bin/chkey/Makefile b/usr.bin/chkey/Makefile
index 032743af039c..c0bbd6aea174 100644
--- a/usr.bin/chkey/Makefile
+++ b/usr.bin/chkey/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1.1.1 1997/05/28 15:54:04 wpaul Exp $
+# $FreeBSD$
 
 PROG=	chkey
 SRCS=	chkey.c update.c generic.c
diff --git a/usr.bin/chkey/chkey.1 b/usr.bin/chkey/chkey.1
index 6aab3000a359..be4668de7694 100644
--- a/usr.bin/chkey/chkey.1
+++ b/usr.bin/chkey/chkey.1
@@ -1,6 +1,6 @@
 .\" @(#)chkey.1 1.5 91/03/11 TIRPC 1.0;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 5, 1989
 .Dt CHKEY 1
diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index 098bca2a7e34..e0978b655e1a 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chpass.1	8.2 (Berkeley) 12/30/93
-.\"     $Id: chpass.1,v 1.15 1999/02/23 02:41:26 ghelmer Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt CHPASS 1
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index 2809f8bef74f..77f9f7832f84 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -40,7 +40,7 @@ static const char copyright[] =
 #ifndef lint
 static const char sccsid[] = "From: @(#)chpass.c	8.4 (Berkeley) 4/2/94";
 static const char rcsid[] =
-	"$Id: chpass.c,v 1.14 1997/03/29 04:28:38 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/chpass/edit.c b/usr.bin/chpass/edit.c
index cf4ae4d40299..cfb951302d65 100644
--- a/usr.bin/chpass/edit.c
+++ b/usr.bin/chpass/edit.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: edit.c,v 1.13 1999/02/23 02:41:26 ghelmer Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/chpass/pw_yp.c b/usr.bin/chpass/pw_yp.c
index dbc262bcacde..0877987f88bb 100644
--- a/usr.bin/chpass/pw_yp.c
+++ b/usr.bin/chpass/pw_yp.c
@@ -35,7 +35,7 @@
  * Center for Telecommunications Research
  * Columbia University, New York City
  *
- *	$Id: pw_yp.c,v 1.13 1998/10/17 14:08:12 bde Exp $
+ * $FreeBSD$
  */
 
 #ifdef YP
diff --git a/usr.bin/chpass/pw_yp.h b/usr.bin/chpass/pw_yp.h
index 0a1e1c0573d9..15f63d038776 100644
--- a/usr.bin/chpass/pw_yp.h
+++ b/usr.bin/chpass/pw_yp.h
@@ -35,7 +35,7 @@
  * Center for Telecommunications Research
  * Columbia University, New York City
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifdef YP
diff --git a/usr.bin/chpass/util.c b/usr.bin/chpass/util.c
index d8917f51bc96..e7dd06b6db88 100644
--- a/usr.bin/chpass/util.c
+++ b/usr.bin/chpass/util.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)util.c	8.4 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: util.c,v 1.6 1998/03/23 07:41:49 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/cksum/cksum.1 b/usr.bin/cksum/cksum.1
index 37a6e2476b78..66a1d18f0c87 100644
--- a/usr.bin/cksum/cksum.1
+++ b/usr.bin/cksum/cksum.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cksum.1	8.2 (Berkeley) 4/28/95
-.\"	$Id: cksum.1,v 1.7 1997/11/09 16:08:11 obrien Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 28, 1995
 .Dt CKSUM 1
diff --git a/usr.bin/cksum/cksum.c b/usr.bin/cksum/cksum.c
index dbe488c956c3..01a7165c1d9c 100644
--- a/usr.bin/cksum/cksum.c
+++ b/usr.bin/cksum/cksum.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)cksum.c	8.2 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: cksum.c,v 1.8 1997/11/09 05:47:55 obrien Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/cmp/cmp.1 b/usr.bin/cmp/cmp.1
index 005dfd2ebd60..6153e5160cb4 100644
--- a/usr.bin/cmp/cmp.1
+++ b/usr.bin/cmp/cmp.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cmp.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: cmp.1,v 1.5 1997/06/26 11:22:10 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt CMP 1
diff --git a/usr.bin/col/col.1 b/usr.bin/col/col.1
index 577998e261f4..afd9c2778526 100644
--- a/usr.bin/col/col.1
+++ b/usr.bin/col/col.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)col.1	8.1 (Berkeley) 6/29/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 29, 1993
 .Dt COL 1
diff --git a/usr.bin/colcrt/colcrt.1 b/usr.bin/colcrt/colcrt.1
index 7330c088b43d..1167e4694736 100644
--- a/usr.bin/colcrt/colcrt.1
+++ b/usr.bin/colcrt/colcrt.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)colcrt.1	8.1 (Berkeley) 6/30/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 30, 1993
 .Dt COLCRT 1
diff --git a/usr.bin/colldef/Makefile b/usr.bin/colldef/Makefile
index ccb5e98f452e..29b5e108b553 100644
--- a/usr.bin/colldef/Makefile
+++ b/usr.bin/colldef/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.13 1998/05/05 13:16:22 bde Exp $
+# $FreeBSD$
 
 PROG = colldef
 LFLAGS = -8 -i
diff --git a/usr.bin/colldef/colldef.1 b/usr.bin/colldef/colldef.1
index 66bb90f6d536..9f4f78169c7d 100644
--- a/usr.bin/colldef/colldef.1
+++ b/usr.bin/colldef/colldef.1
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: colldef.1,v 1.5 1997/06/26 11:25:16 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd January, 27 1995
 .Dt COLLDEF 1
diff --git a/usr.bin/colldef/data/Makefile b/usr.bin/colldef/data/Makefile
index 8bffc4e625a4..b828085c3b5a 100644
--- a/usr.bin/colldef/data/Makefile
+++ b/usr.bin/colldef/data/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.22 1999/06/05 03:03:57 julian Exp $
+# $FreeBSD$
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
diff --git a/usr.bin/colldef/data/de_DE.DIS_8859-15.src b/usr.bin/colldef/data/de_DE.DIS_8859-15.src
index e952d169902e..f5d609346cc7 100644
--- a/usr.bin/colldef/data/de_DE.DIS_8859-15.src
+++ b/usr.bin/colldef/data/de_DE.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # German/ISO 8859-1 (backward compatible with ASCII)
 #
-# $Id: de_DE.DIS_8859-15.src,v 1.2 1999/02/12 21:14:41 ache Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 substitute <ss> with "ss"
diff --git a/usr.bin/colldef/data/de_DE.ISO_8859-1.src b/usr.bin/colldef/data/de_DE.ISO_8859-1.src
index f366e97d2916..52d155d75a54 100644
--- a/usr.bin/colldef/data/de_DE.ISO_8859-1.src
+++ b/usr.bin/colldef/data/de_DE.ISO_8859-1.src
@@ -1,6 +1,6 @@
 # German/ISO 8859-1 (backward compatible with ASCII)
 #
-# $Id: de_DE.ISO_8859-1.src,v 1.5 1999/02/12 21:14:41 ache Exp $
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 substitute <ss> with "ss"
diff --git a/usr.bin/colldef/data/es_ES.DIS_8859-15.src b/usr.bin/colldef/data/es_ES.DIS_8859-15.src
index d31a73bf0372..002b63503d5a 100644
--- a/usr.bin/colldef/data/es_ES.DIS_8859-15.src
+++ b/usr.bin/colldef/data/es_ES.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # Espan~ol (backward compatible with ASCII)
 #
-# $Id: es_ES.DIS_8859-15.src,v 1.3 1997/02/22 19:54:35 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/usr.bin/colldef/data/es_ES.ISO_8859-1.src b/usr.bin/colldef/data/es_ES.ISO_8859-1.src
index e088e21b5c46..7c2b21fc5955 100644
--- a/usr.bin/colldef/data/es_ES.ISO_8859-1.src
+++ b/usr.bin/colldef/data/es_ES.ISO_8859-1.src
@@ -1,6 +1,6 @@
 # Espan~ol (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 order \
diff --git a/usr.bin/colldef/data/is_IS.DIS_8859-15.src b/usr.bin/colldef/data/is_IS.DIS_8859-15.src
index 605a8433ae1e..fe4dd9beae88 100644
--- a/usr.bin/colldef/data/is_IS.DIS_8859-15.src
+++ b/usr.bin/colldef/data/is_IS.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # icelandic (backward compatible with ASCII)
 #
-# $Id: is_IS.DIS_8859-15.src,v 1.4 1997/02/22 19:54:38 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/usr.bin/colldef/data/is_IS.ISO_8859-1.src b/usr.bin/colldef/data/is_IS.ISO_8859-1.src
index 288459c0b3fd..50cd9a95ca8f 100644
--- a/usr.bin/colldef/data/is_IS.ISO_8859-1.src
+++ b/usr.bin/colldef/data/is_IS.ISO_8859-1.src
@@ -1,6 +1,6 @@
 # icelandic (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 order \
diff --git a/usr.bin/colldef/data/lt_LN.ASCII.src b/usr.bin/colldef/data/lt_LN.ASCII.src
index 525ebb979707..df3c34088764 100644
--- a/usr.bin/colldef/data/lt_LN.ASCII.src
+++ b/usr.bin/colldef/data/lt_LN.ASCII.src
@@ -1,6 +1,6 @@
 # ASCII
 #
-# $Id: lt_LN.ISO_8859-1.src,v 1.8 1997/02/22 19:54:39 peter Exp $
+# $FreeBSD$
 #
 order \
 	\x00;...;\xff
diff --git a/usr.bin/colldef/data/lt_LN.DIS_8859-15.src b/usr.bin/colldef/data/lt_LN.DIS_8859-15.src
index 71de58338709..449ce85e6336 100644
--- a/usr.bin/colldef/data/lt_LN.DIS_8859-15.src
+++ b/usr.bin/colldef/data/lt_LN.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # latin1 (backward compatible with ASCII)
 #
-# $Id: lt_LN.DIS_8859-15.src,v 1.8 1997/02/22 19:54:39 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/usr.bin/colldef/data/lt_LN.ISO_8859-1.src b/usr.bin/colldef/data/lt_LN.ISO_8859-1.src
index 93a2da01484a..99b7d08ddb00 100644
--- a/usr.bin/colldef/data/lt_LN.ISO_8859-1.src
+++ b/usr.bin/colldef/data/lt_LN.ISO_8859-1.src
@@ -1,6 +1,6 @@
 # latin1 (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 order \
diff --git a/usr.bin/colldef/data/lt_LN.ISO_8859-2.src b/usr.bin/colldef/data/lt_LN.ISO_8859-2.src
index 772fe3220385..aee3671f0966 100644
--- a/usr.bin/colldef/data/lt_LN.ISO_8859-2.src
+++ b/usr.bin/colldef/data/lt_LN.ISO_8859-2.src
@@ -1,6 +1,6 @@
 # latin2 (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-2
 order \
diff --git a/usr.bin/colldef/data/ru_SU.CP866.src b/usr.bin/colldef/data/ru_SU.CP866.src
index 88ca377082a7..2fc2d20835c3 100644
--- a/usr.bin/colldef/data/ru_SU.CP866.src
+++ b/usr.bin/colldef/data/ru_SU.CP866.src
@@ -1,6 +1,6 @@
 # CP866 (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.CP866
 order \
diff --git a/usr.bin/colldef/data/ru_SU.KOI8-R.src b/usr.bin/colldef/data/ru_SU.KOI8-R.src
index f6b0a1877bef..3a67bc4e39fb 100644
--- a/usr.bin/colldef/data/ru_SU.KOI8-R.src
+++ b/usr.bin/colldef/data/ru_SU.KOI8-R.src
@@ -1,6 +1,6 @@
 # koi8-r (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.KOI8-R
 order \
diff --git a/usr.bin/colldef/parse.y b/usr.bin/colldef/parse.y
index da485dacd989..c4beb8b59b95 100644
--- a/usr.bin/colldef/parse.y
+++ b/usr.bin/colldef/parse.y
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: parse.y,v 1.13 1999/02/12 20:56:49 ache Exp $
+ * $FreeBSD$
  */
 
 #include <err.h>
diff --git a/usr.bin/colldef/scan.l b/usr.bin/colldef/scan.l
index 405068d5a272..d99f001caa1c 100644
--- a/usr.bin/colldef/scan.l
+++ b/usr.bin/colldef/scan.l
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: scan.l,v 1.8 1999/02/12 20:39:06 ache Exp $
+ * $FreeBSD$
  */
 
 #include <ctype.h>
diff --git a/usr.bin/colrm/colrm.1 b/usr.bin/colrm/colrm.1
index 3b3266b7fd32..ddc083b3ceb5 100644
--- a/usr.bin/colrm/colrm.1
+++ b/usr.bin/colrm/colrm.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)colrm.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt COLRM 1
diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c
index 2c9e0e496e6e..b00182d604dd 100644
--- a/usr.bin/colrm/colrm.c
+++ b/usr.bin/colrm/colrm.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: colrm.c,v 1.5 1997/12/29 00:08:59 alex Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/column/column.1 b/usr.bin/column/column.1
index 298eed842ecf..4b8ec9ba5234 100644
--- a/usr.bin/column/column.1
+++ b/usr.bin/column/column.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)column.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Os
diff --git a/usr.bin/comm/comm.1 b/usr.bin/comm/comm.1
index 8876de8df644..7fe49374dd85 100644
--- a/usr.bin/comm/comm.1
+++ b/usr.bin/comm/comm.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)comm.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Os
diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c
index 70e7c0d01616..25e0f2f77439 100644
--- a/usr.bin/comm/comm.c
+++ b/usr.bin/comm/comm.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "From: @(#)comm.c	8.4 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: comm.c,v 1.4 1997/09/07 15:09:17 joerg Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/compile_et/Makefile b/usr.bin/compile_et/Makefile
index 137f88bc719e..d8cd73854eb7 100644
--- a/usr.bin/compile_et/Makefile
+++ b/usr.bin/compile_et/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.8 1998/03/20 16:21:39 bde Exp $
+# $FreeBSD$
 
 PROG=	compile_et
 SRCS=	compile_et.c error_table.y
diff --git a/usr.bin/compress/compress.1 b/usr.bin/compress/compress.1
index a06c8a0a9a1e..075052f06cf4 100644
--- a/usr.bin/compress/compress.1
+++ b/usr.bin/compress/compress.1
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)compress.1	8.2 (Berkeley) 4/18/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt COMPRESS 1
diff --git a/usr.bin/compress/zopen.3 b/usr.bin/compress/zopen.3
index 1584edded25b..f97ebde61fb6 100644
--- a/usr.bin/compress/zopen.3
+++ b/usr.bin/compress/zopen.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)zopen.3	8.1 (Berkeley) 6/9/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt ZOPEN 3
diff --git a/usr.bin/compress/zopen.h b/usr.bin/compress/zopen.h
index 322fd2de9a23..1a22de12cab3 100644
--- a/usr.bin/compress/zopen.h
+++ b/usr.bin/compress/zopen.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * 	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _ZOPEN_H_
diff --git a/usr.bin/cpp/cpp.sh b/usr.bin/cpp/cpp.sh
index df09d6de30de..19dee9d4d558 100644
--- a/usr.bin/cpp/cpp.sh
+++ b/usr.bin/cpp/cpp.sh
@@ -36,7 +36,7 @@
 # SUCH DAMAGE.
 #
 #	From: @(#)cpp.sh	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 #
 # Transitional front end to CCCP to make it behave like (Reiser) CCP:
 #	specifies -traditional
diff --git a/usr.bin/ctags/C.c b/usr.bin/ctags/C.c
index c030cedb2640..55c637e7ddf1 100644
--- a/usr.bin/ctags/C.c
+++ b/usr.bin/ctags/C.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)C.c	8.4 (Berkeley) 4/2/94";
 #else
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/ctags/ctags.1 b/usr.bin/ctags/ctags.1
index 49ac44239959..5e841f21b978 100644
--- a/usr.bin/ctags/ctags.1
+++ b/usr.bin/ctags/ctags.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ctags.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt CTAGS 1
diff --git a/usr.bin/cut/cut.1 b/usr.bin/cut/cut.1
index 207165109d2d..e0e9a7127d1a 100644
--- a/usr.bin/cut/cut.1
+++ b/usr.bin/cut/cut.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cut.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt CUT 1
diff --git a/usr.bin/dig/Makefile b/usr.bin/dig/Makefile
index 8faa06ae3329..7b1e7f085c43 100644
--- a/usr.bin/dig/Makefile
+++ b/usr.bin/dig/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 1997/02/22 19:54:49 peter Exp $
+# $FreeBSD$
 
 .include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
 
diff --git a/usr.bin/dnsquery/Makefile b/usr.bin/dnsquery/Makefile
index 2486aded5c42..ac7cc113aaa8 100644
--- a/usr.bin/dnsquery/Makefile
+++ b/usr.bin/dnsquery/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 1997/02/22 19:54:50 peter Exp $
+# $FreeBSD$
 
 .include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
 
diff --git a/usr.bin/doscmd/Makefile b/usr.bin/doscmd/Makefile
index e6a364db0fad..d620c8ec3485 100644
--- a/usr.bin/doscmd/Makefile
+++ b/usr.bin/doscmd/Makefile
@@ -1,6 +1,6 @@
 # from BSDI Makefile,v 2.6 1996/04/08 20:06:40 bostic Exp
 #
-# $Id: Makefile,v 1.18 1999/03/16 20:57:19 imp Exp $
+# $FreeBSD$
 
 PROG=	doscmd
 SRCS=	AsyncIO.c ParseBuffer.c bios.c callback.c cpu.c dos.c cmos.c config.c \
diff --git a/usr.bin/doscmd/ParseBuffer.c b/usr.bin/doscmd/ParseBuffer.c
index 88c4771ecce5..2eeaeed31647 100644
--- a/usr.bin/doscmd/ParseBuffer.c
+++ b/usr.bin/doscmd/ParseBuffer.c
@@ -29,7 +29,7 @@
  *
  *	BSDI ParseBuffer.c,v 2.2 1996/04/08 19:32:15 bostic Exp
  *
- * $Id: ParseBuffer.c,v 1.2 1996/09/22 05:52:53 miff Exp $
+ * $FreeBSD$
  */
 
 #include <stdlib.h>
diff --git a/usr.bin/doscmd/bios.c b/usr.bin/doscmd/bios.c
index ccfdce826381..c6cea9204ff5 100644
--- a/usr.bin/doscmd/bios.c
+++ b/usr.bin/doscmd/bios.c
@@ -29,7 +29,7 @@
  *
  *	BSDI bios.c,v 2.3 1996/04/08 19:32:19 bostic Exp
  *
- * $Id: bios.c,v 1.2 1997/08/15 23:41:23 jlemon Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/callback.c b/usr.bin/doscmd/callback.c
index 4b333ecc7c37..890c7142d454 100644
--- a/usr.bin/doscmd/callback.c
+++ b/usr.bin/doscmd/callback.c
@@ -1,6 +1,6 @@
 /* No copyright?!
 **
-** $Id: callback.c,v 1.3 1996/09/24 00:02:25 miff Exp $
+** $FreeBSD$
 */
 
 
diff --git a/usr.bin/doscmd/callback.h b/usr.bin/doscmd/callback.h
index f81127e59f79..d3c656fd7c26 100644
--- a/usr.bin/doscmd/callback.h
+++ b/usr.bin/doscmd/callback.h
@@ -1,7 +1,7 @@
 /* 
 ** No copyright?!
 **
-** $Id: callback.h,v 1.4 1996/09/22 15:42:48 miff Exp $
+** $FreeBSD$
 */
 typedef void		(*callback_t)(regcontext_t *REGS);
 
diff --git a/usr.bin/doscmd/cmos.c b/usr.bin/doscmd/cmos.c
index 115cbc7ccde6..1486c6fd348e 100644
--- a/usr.bin/doscmd/cmos.c
+++ b/usr.bin/doscmd/cmos.c
@@ -29,7 +29,7 @@
  *
  *	BSDI cmos.c,v 2.3 1996/04/08 19:32:20 bostic Exp
  *
- * $Id: cmos.c,v 1.2 1996/09/18 16:12:24 miff Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/com.h b/usr.bin/doscmd/com.h
index c2857e2a43d4..98982a958722 100644
--- a/usr.bin/doscmd/com.h
+++ b/usr.bin/doscmd/com.h
@@ -29,7 +29,7 @@
  *
  *	BSDI com.h,v 2.2 1996/04/08 19:32:21 bostic Exp
  *
- * $Id: com.h,v 1.3 1996/09/22 15:42:48 miff Exp $
+ * $FreeBSD$
  */
 
 /* com.h for doscmd int14.c */
diff --git a/usr.bin/doscmd/config.c b/usr.bin/doscmd/config.c
index 823c00a937fc..d20aa1579a17 100644
--- a/usr.bin/doscmd/config.c
+++ b/usr.bin/doscmd/config.c
@@ -29,7 +29,7 @@
  *
  *	BSDI config.c,v 2.2 1996/04/08 19:32:22 bostic Exp
  *
- * $Id: config.c,v 1.1 1997/08/09 01:42:35 dyson Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/usr.bin/doscmd/cpu.c b/usr.bin/doscmd/cpu.c
index bad8725e9bd1..c273084547e0 100644
--- a/usr.bin/doscmd/cpu.c
+++ b/usr.bin/doscmd/cpu.c
@@ -1,7 +1,7 @@
 /*
 ** No copyright ?!
 **
-** $Id: cpu.c,v 1.5 1996/09/25 11:05:54 miff Exp $
+** $FreeBSD$
 */
 #include "doscmd.h"
 
diff --git a/usr.bin/doscmd/crt0.c b/usr.bin/doscmd/crt0.c
index 9b3779b15af6..ec9c706f7f5c 100644
--- a/usr.bin/doscmd/crt0.c
+++ b/usr.bin/doscmd/crt0.c
@@ -29,7 +29,7 @@
  *
  *	BSDI crt0.c,v 2.2 1996/04/08 19:32:24 bostic Exp
  *
- * $Id: crt0.c,v 1.2 1996/09/18 16:12:25 miff Exp $
+ * $FreeBSD$
  */
 
 char **environ;
diff --git a/usr.bin/doscmd/cwd.c b/usr.bin/doscmd/cwd.c
index 6a9b60f4a9cf..a5d6c88c83f4 100644
--- a/usr.bin/doscmd/cwd.c
+++ b/usr.bin/doscmd/cwd.c
@@ -29,7 +29,7 @@
  *
  *	BSDI cwd.c,v 2.2 1996/04/08 19:32:25 bostic Exp
  *
- * $Id: cwd.c,v 1.2 1998/07/01 19:56:13 imp Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/doscmd/cwd.h b/usr.bin/doscmd/cwd.h
index 323512ff9e4e..dfe7e4ea4486 100644
--- a/usr.bin/doscmd/cwd.h
+++ b/usr.bin/doscmd/cwd.h
@@ -29,7 +29,7 @@
  *
  *	BSDI cwd.h,v 2.2 1996/04/08 19:32:26 bostic Exp
  *
- * $Id: cwd.h,v 1.3 1996/09/23 09:59:23 miff Exp $
+ * $FreeBSD$
  */
 
 static inline u_char *
diff --git a/usr.bin/doscmd/debug.c b/usr.bin/doscmd/debug.c
index e736f8db4c6b..dde4fcb72c00 100644
--- a/usr.bin/doscmd/debug.c
+++ b/usr.bin/doscmd/debug.c
@@ -31,7 +31,7 @@
  *
  * from: BSDI doscmd.c,v 2.3 1996/04/08 19:32:30 bostic Exp
  *
- * $Id: debug.c,v 1.5 1996/09/25 00:03:43 miff Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/usr.bin/doscmd/dispatch.h b/usr.bin/doscmd/dispatch.h
index 59620f159312..7506c534220a 100644
--- a/usr.bin/doscmd/dispatch.h
+++ b/usr.bin/doscmd/dispatch.h
@@ -23,7 +23,7 @@
 ** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 ** SUCH DAMAGE.
 **
-** $Id: dispatch.h,v 1.3 1996/09/22 05:52:56 miff Exp $
+** $FreeBSD$
 */
 
 /*
diff --git a/usr.bin/doscmd/dos.c b/usr.bin/doscmd/dos.c
index b81330483f18..7b8fa0c9a911 100644
--- a/usr.bin/doscmd/dos.c
+++ b/usr.bin/doscmd/dos.c
@@ -31,7 +31,7 @@
  *
  *	BSDI int21.c,v 2.2 1996/04/08 19:32:51 bostic Exp
  *
- * $Id: dos.c,v 1.4 1998/07/16 23:54:23 imp Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/dos.h b/usr.bin/doscmd/dos.h
index 030438e7e922..1ec83ac7f32c 100644
--- a/usr.bin/doscmd/dos.h
+++ b/usr.bin/doscmd/dos.h
@@ -29,7 +29,7 @@
  *
  *	BSDI dos.h,v 2.2 1996/04/08 19:32:28 bostic Exp
  *
- * $Id: dos.h,v 1.7 1996/09/23 09:59:24 miff Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/usr.bin/doscmd/doscmd.1 b/usr.bin/doscmd/doscmd.1
index 08b320c1b9f9..4d039a4b0b66 100644
--- a/usr.bin/doscmd/doscmd.1
+++ b/usr.bin/doscmd/doscmd.1
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	BSDI doscmd.1,v 2.3 1996/04/08 19:32:29 bostic Exp
-.\"	$Id: doscmd.1,v 1.9 1999/07/12 20:23:25 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 30, 1995
 .Dt DOSCMD 1
diff --git a/usr.bin/doscmd/doscmd.c b/usr.bin/doscmd/doscmd.c
index 454a38be2938..8e8da70f5191 100644
--- a/usr.bin/doscmd/doscmd.c
+++ b/usr.bin/doscmd/doscmd.c
@@ -29,7 +29,7 @@
  *
  *	BSDI doscmd.c,v 2.3 1996/04/08 19:32:30 bostic Exp
  *
- * $Id: doscmd.c,v 1.7 1998/07/16 23:54:25 imp Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/doscmd/doscmd.h b/usr.bin/doscmd/doscmd.h
index 224f9efe1178..1c960647d6f4 100644
--- a/usr.bin/doscmd/doscmd.h
+++ b/usr.bin/doscmd/doscmd.h
@@ -29,7 +29,7 @@
  *
  *	BSDI doscmd.h,v 2.3 1996/04/08 19:32:32 bostic Exp
  *
- * $Id: doscmd.h,v 1.3 1997/09/30 22:03:41 jlemon Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/usr.bin/doscmd/doscmd_loader.c b/usr.bin/doscmd/doscmd_loader.c
index 7032bfb5cf25..d219ad52b46e 100644
--- a/usr.bin/doscmd/doscmd_loader.c
+++ b/usr.bin/doscmd/doscmd_loader.c
@@ -29,7 +29,7 @@
  *
  *	BSDI doscmd_loader.c,v 2.3 1996/04/08 19:32:33 bostic Exp
  *
- * $Id: doscmd_loader.c,v 1.2 1996/09/22 05:52:59 miff Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/usr.bin/doscmd/ems.c b/usr.bin/doscmd/ems.c
index 25b68db32695..1b9b04568432 100644
--- a/usr.bin/doscmd/ems.c
+++ b/usr.bin/doscmd/ems.c
@@ -25,7 +25,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$
+ * $FreeBSD$
  */
 
 /* 
diff --git a/usr.bin/doscmd/ems.h b/usr.bin/doscmd/ems.h
index 990866cff785..276bddc6bbde 100644
--- a/usr.bin/doscmd/ems.h
+++ b/usr.bin/doscmd/ems.h
@@ -25,7 +25,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: ems.h,v 1.1 1997/09/30 22:03:45 jlemon Exp $
+ * $FreeBSD$
  */
 
 #ifndef EMS_H
diff --git a/usr.bin/doscmd/emsdriv.S b/usr.bin/doscmd/emsdriv.S
index ffa2c9839212..40c7affd00b7 100644
--- a/usr.bin/doscmd/emsdriv.S
+++ b/usr.bin/doscmd/emsdriv.S
@@ -24,7 +24,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$
+! $FreeBSD$
 
 
 !
diff --git a/usr.bin/doscmd/emuint.c b/usr.bin/doscmd/emuint.c
index 1b2bfdd73290..9c230a3c0dae 100644
--- a/usr.bin/doscmd/emuint.c
+++ b/usr.bin/doscmd/emuint.c
@@ -25,7 +25,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$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/usr.bin/doscmd/emuint.h b/usr.bin/doscmd/emuint.h
index d90b60ec36ec..d3797687eda3 100644
--- a/usr.bin/doscmd/emuint.h
+++ b/usr.bin/doscmd/emuint.h
@@ -25,7 +25,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$
+ * $FreeBSD$
  */
 
 
diff --git a/usr.bin/doscmd/exe.c b/usr.bin/doscmd/exe.c
index 0314a62442e7..ce9a8f02d049 100644
--- a/usr.bin/doscmd/exe.c
+++ b/usr.bin/doscmd/exe.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	BSDI exe.c,v 2.2 1996/04/08 19:32:34 bostic Exp
- * $Id: exe.c,v 1.3 1996/09/22 06:26:01 miff Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/usr.bin/doscmd/int.c b/usr.bin/doscmd/int.c
index 2385f5624a1f..3b72e24bebaa 100644
--- a/usr.bin/doscmd/int.c
+++ b/usr.bin/doscmd/int.c
@@ -1,7 +1,7 @@
 /*
 ** No copyright?!
 **
-** $Id: int.c,v 1.4 1997/03/18 02:36:56 msmith Exp $
+** $FreeBSD$
 */
 #include "doscmd.h"
 
diff --git a/usr.bin/doscmd/int10.c b/usr.bin/doscmd/int10.c
index 0f02cbd94032..32bec88c1c53 100644
--- a/usr.bin/doscmd/int10.c
+++ b/usr.bin/doscmd/int10.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int10.c,v 2.3 1996/04/08 19:32:40 bostic Exp
  *
- * $Id: int10.c,v 1.2 1996/09/22 05:53:00 miff Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int13.c b/usr.bin/doscmd/int13.c
index 2e6db4b96ec0..84cb13f6eb0d 100644
--- a/usr.bin/doscmd/int13.c
+++ b/usr.bin/doscmd/int13.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int13.c,v 2.3 1996/04/08 19:32:43 bostic Exp
  *
- * $Id: int13.c,v 1.1 1997/08/09 01:42:46 dyson Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int14.c b/usr.bin/doscmd/int14.c
index 602bb80b14f0..4d367eb7f4a0 100644
--- a/usr.bin/doscmd/int14.c
+++ b/usr.bin/doscmd/int14.c
@@ -32,7 +32,7 @@
  *
  *	BSDI int14.c,v 2.2 1996/04/08 19:32:45 bostic Exp
  *
- * $Id: int14.c,v 1.3 1996/09/22 15:42:53 miff Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int16.c b/usr.bin/doscmd/int16.c
index ccf99cd7e458..517e1312c186 100644
--- a/usr.bin/doscmd/int16.c
+++ b/usr.bin/doscmd/int16.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int16.c,v 2.2 1996/04/08 19:32:47 bostic Exp
  *
- * $Id: int16.c,v 1.3 1996/09/22 15:42:54 miff Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int17.c b/usr.bin/doscmd/int17.c
index 88621917a55a..d62d6da9b321 100644
--- a/usr.bin/doscmd/int17.c
+++ b/usr.bin/doscmd/int17.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int17.c,v 2.2 1996/04/08 19:32:48 bostic Exp
  *
- * $Id: int17.c,v 1.2 1998/01/22 02:44:54 msmith Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int1a.c b/usr.bin/doscmd/int1a.c
index 7a973307540e..ff7df30f8376 100644
--- a/usr.bin/doscmd/int1a.c
+++ b/usr.bin/doscmd/int1a.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int1a.c,v 2.2 1996/04/08 19:32:49 bostic Exp
  *
- * $Id: int1a.c,v 1.1 1997/08/09 01:42:49 dyson Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int2f.c b/usr.bin/doscmd/int2f.c
index e8fecb3d9538..8bfe3d8db71e 100644
--- a/usr.bin/doscmd/int2f.c
+++ b/usr.bin/doscmd/int2f.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int2f.c,v 2.2 1996/04/08 19:32:53 bostic Exp
  *
- * $Id: int2f.c,v 1.1 1997/08/09 01:42:50 dyson Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/intff.c b/usr.bin/doscmd/intff.c
index a32c64698c80..fd167af6cf4e 100644
--- a/usr.bin/doscmd/intff.c
+++ b/usr.bin/doscmd/intff.c
@@ -29,7 +29,7 @@
  *
  *	BSDI intff.c,v 2.2 1996/04/08 19:32:56 bostic Exp
  *
- * $Id: intff.c,v 1.4 1998/07/02 05:12:53 imp Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/mem.c b/usr.bin/doscmd/mem.c
index 025d86e37bfe..bae413f660fc 100644
--- a/usr.bin/doscmd/mem.c
+++ b/usr.bin/doscmd/mem.c
@@ -29,7 +29,7 @@
  *
  *	BSDI mem.c,v 2.2 1996/04/08 19:32:57 bostic Exp
  *
- * $Id: mem.c,v 1.4 1996/09/22 15:42:57 miff Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/usr.bin/doscmd/mouse.c b/usr.bin/doscmd/mouse.c
index 859366705fb4..c9a07740a0fa 100644
--- a/usr.bin/doscmd/mouse.c
+++ b/usr.bin/doscmd/mouse.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int33.c,v 2.2 1996/04/08 19:32:54 bostic Exp
  *
- * $Id: mouse.c,v 1.3 1996/09/22 15:42:58 miff Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/mouse.h b/usr.bin/doscmd/mouse.h
index e819c50ad901..b77cba48f57d 100644
--- a/usr.bin/doscmd/mouse.h
+++ b/usr.bin/doscmd/mouse.h
@@ -29,7 +29,7 @@
  *
  *	BSDI mouse.h,v 2.2 1996/04/08 19:32:58 bostic Exp
  *
- * $Id: mouse.h,v 1.3 1996/09/22 15:42:58 miff Exp $
+ * $FreeBSD$
  */
 
 typedef struct {
diff --git a/usr.bin/doscmd/net.c b/usr.bin/doscmd/net.c
index 464113f62e72..b899d96599a8 100644
--- a/usr.bin/doscmd/net.c
+++ b/usr.bin/doscmd/net.c
@@ -1,7 +1,7 @@
 /*
 ** No copyright!
 **
-** $Id: net.c,v 1.3 1996/09/22 15:42:58 miff Exp $
+** $FreeBSD$
 **
 ** NetBIOS etc. hooks.
 */
diff --git a/usr.bin/doscmd/port.c b/usr.bin/doscmd/port.c
index c9a06b29957f..eb2158f1e7d1 100644
--- a/usr.bin/doscmd/port.c
+++ b/usr.bin/doscmd/port.c
@@ -29,7 +29,7 @@
  *
  *	BSDI port.c,v 2.2 1996/04/08 19:33:03 bostic Exp
  *
- * $Id: port.c,v 1.1 1997/08/09 01:42:54 dyson Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/redir.S b/usr.bin/doscmd/redir.S
index 4cb4e2e86c34..1f40f3cce6e8 100644
--- a/usr.bin/doscmd/redir.S
+++ b/usr.bin/doscmd/redir.S
@@ -24,7 +24,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$
+! $FreeBSD$
 
 
 !
diff --git a/usr.bin/doscmd/register.h b/usr.bin/doscmd/register.h
index 1b6cecc23512..ba0e91e03a9a 100644
--- a/usr.bin/doscmd/register.h
+++ b/usr.bin/doscmd/register.h
@@ -23,7 +23,7 @@
 ** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 ** SUCH DAMAGE.
 **
-** $Id: register.h,v 1.4 1997/03/18 02:36:56 msmith Exp $
+** $FreeBSD$
 */
 
 /******************************************************************************
diff --git a/usr.bin/doscmd/setver.c b/usr.bin/doscmd/setver.c
index 2ae35180338c..5826567373ed 100644
--- a/usr.bin/doscmd/setver.c
+++ b/usr.bin/doscmd/setver.c
@@ -29,7 +29,7 @@
  *
  *	BSDI setver.c,v 2.2 1996/04/08 19:33:04 bostic Exp
  *
- * $Id: setver.c,v 1.2 1996/09/22 05:53:09 miff Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/signal.c b/usr.bin/doscmd/signal.c
index f42e4cd61d59..704159760575 100644
--- a/usr.bin/doscmd/signal.c
+++ b/usr.bin/doscmd/signal.c
@@ -29,7 +29,7 @@
  *
  *	BSDI signal.c,v 2.2 1996/04/08 19:33:06 bostic Exp
  *
- * $Id: signal.c,v 1.2 1998/02/28 16:02:24 jraynard Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/timer.c b/usr.bin/doscmd/timer.c
index afaa69f804d3..41b30199585a 100644
--- a/usr.bin/doscmd/timer.c
+++ b/usr.bin/doscmd/timer.c
@@ -1,7 +1,7 @@
 /*
 ** No copyright?!
 **
-** $Id: timer.c,v 1.3 1996/09/22 15:42:59 miff Exp $
+** $FreeBSD$
 */
 #include "doscmd.h"
 
diff --git a/usr.bin/doscmd/trace.c b/usr.bin/doscmd/trace.c
index 65a6ae36199e..9be758fd7ba6 100644
--- a/usr.bin/doscmd/trace.c
+++ b/usr.bin/doscmd/trace.c
@@ -29,7 +29,7 @@
  *
  *	BSDI trace.c,v 2.2 1996/04/08 19:33:07 bostic Exp
  *
- * $Id: trace.c,v 1.3 1996/09/25 00:03:44 miff Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/trap.c b/usr.bin/doscmd/trap.c
index f8107502673c..8b41caa43084 100644
--- a/usr.bin/doscmd/trap.c
+++ b/usr.bin/doscmd/trap.c
@@ -29,7 +29,7 @@
  *
  *	BSDI trap.c,v 2.3 1996/04/08 19:33:08 bostic Exp
  *
- * $Id: trap.c,v 1.3 1999/07/06 07:15:10 cracauer Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/trap.h b/usr.bin/doscmd/trap.h
index 2aa4e9dfa20c..6cba0df95c3d 100644
--- a/usr.bin/doscmd/trap.h
+++ b/usr.bin/doscmd/trap.h
@@ -29,7 +29,7 @@
  *
  *	BSDI trap.h,v 2.2 1996/04/08 19:33:09 bostic Exp
  *
- * $Id: trap.h,v 1.2 1996/09/22 05:53:11 miff Exp $
+ * $FreeBSD$
  */
 
 #define	CLI	0xfa
diff --git a/usr.bin/doscmd/tty.c b/usr.bin/doscmd/tty.c
index ef42817a05f2..d18f157095f7 100644
--- a/usr.bin/doscmd/tty.c
+++ b/usr.bin/doscmd/tty.c
@@ -29,7 +29,7 @@
  *
  *	BSDI tty.c,v 2.4 1996/04/08 22:03:27 prb Exp
  *
- * $Id: tty.c,v 1.4 1998/02/22 23:36:54 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifndef NO_X
diff --git a/usr.bin/doscmd/video.h b/usr.bin/doscmd/video.h
index 2ddded173c57..7b36eb782056 100644
--- a/usr.bin/doscmd/video.h
+++ b/usr.bin/doscmd/video.h
@@ -29,7 +29,7 @@
  *
  *	BSDI video.h,v 2.2 1996/04/08 19:33:12 bostic Exp
  *
- * $Id: video.h,v 1.2 1996/09/22 05:53:12 miff Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/usr.bin/doscmd/xms.c b/usr.bin/doscmd/xms.c
index b016a0aff87e..9dbd4ba71f9d 100644
--- a/usr.bin/doscmd/xms.c
+++ b/usr.bin/doscmd/xms.c
@@ -25,7 +25,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: xms.c,v 1.3 1997/09/30 22:04:06 jlemon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/usr.bin/doscmd/xms.h b/usr.bin/doscmd/xms.h
index 14a223f895d5..51890282b24c 100644
--- a/usr.bin/doscmd/xms.h
+++ b/usr.bin/doscmd/xms.h
@@ -25,7 +25,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$
+ * $FreeBSD$
  */
 
 #ifndef XMS_H
diff --git a/usr.bin/du/du.1 b/usr.bin/du/du.1
index 8a36cda3c01c..08b1ab456c3e 100644
--- a/usr.bin/du/du.1
+++ b/usr.bin/du/du.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)du.1	8.2 (Berkeley) 4/1/94
-.\"	$Id: du.1,v 1.10 1997/12/29 20:56:21 jkh Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 1, 1994
 .Dt DU 1
diff --git a/usr.bin/ee/ee.1 b/usr.bin/ee/ee.1
index 6d4ef415f851..2571b6fa77fa 100644
--- a/usr.bin/ee/ee.1
+++ b/usr.bin/ee/ee.1
@@ -1,5 +1,5 @@
 .\"
-.\"  $Id$
+.\" $FreeBSD$
 .\"
 .Dd August 30, 1995
 .Dt EE 1
diff --git a/usr.bin/ee/ee.c b/usr.bin/ee/ee.c
index bb38c7007d16..c44ec0057cf4 100644
--- a/usr.bin/ee/ee.c
+++ b/usr.bin/ee/ee.c
@@ -52,7 +52,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: ee.c,v 1.11 1998/10/01 21:18:18 obrien Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 char *ee_copyright_message = 
@@ -64,7 +64,7 @@ char *ee_long_notice[] = {
 	"copyright.  All rights are reserved."
 	};
 
-char *version = "@(#) ee, version 1.3  $Revision: 1.11 $";
+char *version = "@(#) ee, version 1.3  $Revision: 1.12 $";
 
 #ifdef NCURSE
 #include "new_curse.h"
diff --git a/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg b/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg
index 21055c2f038c..ef2ce2230d3e 100644
--- a/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg
+++ b/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $ 
-$ $Id$
+$ $FreeBSD$
 $ 
 $set 1
 $quote "
diff --git a/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg b/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg
index 21055c2f038c..ef2ce2230d3e 100644
--- a/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg
+++ b/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $ 
-$ $Id$
+$ $FreeBSD$
 $ 
 $set 1
 $quote "
diff --git a/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg b/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg
index 6a5fad2b324a..0a383ad0cfe2 100644
--- a/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg
+++ b/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $ 
-$ $Id$
+$ $FreeBSD$
 $ 
 $set 1
 $quote "
diff --git a/usr.bin/ee/nls/en_US.US-ASCII/ee.msg b/usr.bin/ee/nls/en_US.US-ASCII/ee.msg
index 6a5fad2b324a..0a383ad0cfe2 100644
--- a/usr.bin/ee/nls/en_US.US-ASCII/ee.msg
+++ b/usr.bin/ee/nls/en_US.US-ASCII/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $ 
-$ $Id$
+$ $FreeBSD$
 $ 
 $set 1
 $quote "
diff --git a/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg b/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg
index 10c3255c5dfb..e4c2c9567b35 100644
--- a/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg
+++ b/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $
-$ $Id: ee.msg,v 1.7 1998/01/12 07:53:05 charnier Exp $
+$ $FreeBSD$
 $ 
 $set 1
 $quote "
diff --git a/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg b/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg
index 10c3255c5dfb..e4c2c9567b35 100644
--- a/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg
+++ b/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $
-$ $Id: ee.msg,v 1.7 1998/01/12 07:53:05 charnier Exp $
+$ $FreeBSD$
 $ 
 $set 1
 $quote "
diff --git a/usr.bin/enigma/enigma.1 b/usr.bin/enigma/enigma.1
index 61a4c2689a94..aa025e2028a0 100644
--- a/usr.bin/enigma/enigma.1
+++ b/usr.bin/enigma/enigma.1
@@ -4,7 +4,7 @@
 .\" Since enigma itself is distributed in the Public Domain, this file
 .\" is also.
 .\"
-.\" $Id: enigma.1,v 1.3 1999/06/24 06:22:20 mpp Exp $
+.\" $FreeBSD$
 .\" "
 .Dd October 30, 1998
 .Os
diff --git a/usr.bin/error/error.1 b/usr.bin/error/error.1
index 7f5f79c8b224..b944ee6a222f 100644
--- a/usr.bin/error/error.1
+++ b/usr.bin/error/error.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)error.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt ERROR 1
diff --git a/usr.bin/error/filter.c b/usr.bin/error/filter.c
index 1b82cfdf5ee4..84fd970572a9 100644
--- a/usr.bin/error/filter.c
+++ b/usr.bin/error/filter.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)filter.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: filter.c,v 1.2 1997/11/03 07:44:06 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/error/input.c b/usr.bin/error/input.c
index 97b9667cfdd8..602fed616ae6 100644
--- a/usr.bin/error/input.c
+++ b/usr.bin/error/input.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)input.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/error/main.c b/usr.bin/error/main.c
index 7ae8100dbd75..7e8b9d587f51 100644
--- a/usr.bin/error/main.c
+++ b/usr.bin/error/main.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.3 1997/11/03 07:44:12 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/error/pi.c b/usr.bin/error/pi.c
index c5c1ffb9145c..405f548e4b08 100644
--- a/usr.bin/error/pi.c
+++ b/usr.bin/error/pi.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)pi.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: pi.c,v 1.3 1997/11/03 07:44:15 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/error/subr.c b/usr.bin/error/subr.c
index 9a44019ba76b..cd0846392cab 100644
--- a/usr.bin/error/subr.c
+++ b/usr.bin/error/subr.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)subr.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/error/touch.c b/usr.bin/error/touch.c
index 08952f7b593d..de6a396ebd3d 100644
--- a/usr.bin/error/touch.c
+++ b/usr.bin/error/touch.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)touch.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: touch.c,v 1.5 1998/02/25 02:24:04 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/expand/expand.1 b/usr.bin/expand/expand.1
index 4b7014669d68..6c4aebc604b7 100644
--- a/usr.bin/expand/expand.1
+++ b/usr.bin/expand/expand.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)expand.1	8.1 (Berkeley) 6/9/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt EXPAND 1
diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c
index a8014f9a44a2..f16f64582754 100644
--- a/usr.bin/expand/expand.c
+++ b/usr.bin/expand/expand.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)expand.c	8.1 (Berkeley) 6/9/93";
 #else
 static const char rcsid[] = 
-	"$Id: expand.c,v 1.3 1998/02/02 07:10:59 cwt Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/false/false.1 b/usr.bin/false/false.1
index 13989ef97dd1..28339d3b761f 100644
--- a/usr.bin/false/false.1
+++ b/usr.bin/false/false.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)false.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt FALSE 1
diff --git a/usr.bin/fetch/fetch.1 b/usr.bin/fetch/fetch.1
index fd6e78bd6215..40b6835eaa2e 100644
--- a/usr.bin/fetch/fetch.1
+++ b/usr.bin/fetch/fetch.1
@@ -1,4 +1,4 @@
-.\" $Id: fetch.1,v 1.29 1999/02/23 18:51:13 wollman Exp $
+.\" $FreeBSD$
 .Dd February 22, 1999
 .Dt FETCH 1
 .Os FreeBSD 4.0
diff --git a/usr.bin/fetch/fetch.h b/usr.bin/fetch/fetch.h
index 685fdd673042..bea7db93a38e 100644
--- a/usr.bin/fetch/fetch.h
+++ b/usr.bin/fetch/fetch.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: fetch.h,v 1.6 1998/09/20 00:01:26 jkh Exp $
+ * $FreeBSD$
  */
 
 #ifndef fetch_h
diff --git a/usr.bin/fetch/file.c b/usr.bin/fetch/file.c
index 1bdccc8fdc49..24dfd75ab4ca 100644
--- a/usr.bin/fetch/file.c
+++ b/usr.bin/fetch/file.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: file.c,v 1.4 1998/09/17 00:15:15 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/fetch/ftp.c b/usr.bin/fetch/ftp.c
index f2f2640e5630..922887bb2789 100644
--- a/usr.bin/fetch/ftp.c
+++ b/usr.bin/fetch/ftp.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ftp.c,v 1.13 1999/02/05 01:01:17 fenner Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/fetch/http.c b/usr.bin/fetch/http.c
index 0805e2716677..4e19485a9f8f 100644
--- a/usr.bin/fetch/http.c
+++ b/usr.bin/fetch/http.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: http.c,v 1.27 1999/05/18 19:37:37 jmg Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/fetch/main.c b/usr.bin/fetch/main.c
index 6524fd666b03..7cae99ba4e06 100644
--- a/usr.bin/fetch/main.c
+++ b/usr.bin/fetch/main.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: main.c,v 1.51 1999/03/08 19:16:14 wollman Exp $ */
+/* $FreeBSD$ */
 
 #include <sys/types.h>
 
diff --git a/usr.bin/fetch/uri.c b/usr.bin/fetch/uri.c
index 95d4c91898bf..3aeb0d1c74a8 100644
--- a/usr.bin/fetch/uri.c
+++ b/usr.bin/fetch/uri.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/fetch/util.c b/usr.bin/fetch/util.c
index 1a927626e40e..bac316d3a508 100644
--- a/usr.bin/fetch/util.c
+++ b/usr.bin/fetch/util.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: util.c,v 1.5 1997/02/11 20:46:06 wollman Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/file/LEGAL.NOTICE b/usr.bin/file/LEGAL.NOTICE
index 122c5f615624..29f21aed456b 100644
--- a/usr.bin/file/LEGAL.NOTICE
+++ b/usr.bin/file/LEGAL.NOTICE
@@ -1,6 +1,6 @@
 Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995.
 Software written by Ian F. Darwin and others; maintained by Christos Zoulas.
-$Id$
+$FreeBSD$
 
 This software (or derivative software) may not be made subject to any 
 license which denies anyone permission to alter it and redistribute it 
diff --git a/usr.bin/file/MAINT b/usr.bin/file/MAINT
index 2b91576c9de7..cb318445c60f 100644
--- a/usr.bin/file/MAINT
+++ b/usr.bin/file/MAINT
@@ -1,4 +1,4 @@
-$Id$
+$FreeBSD$
 
 Maintenance notes:
 
diff --git a/usr.bin/file/Magdir/Localstuff b/usr.bin/file/Magdir/Localstuff
index 0b6d9554bb9e..a3e1e0bfce4c 100644
--- a/usr.bin/file/Magdir/Localstuff
+++ b/usr.bin/file/Magdir/Localstuff
@@ -2,6 +2,6 @@
 #------------------------------------------------------------------------------
 # Localstuff:  file(1) magic for locally observed files
 #
-# $Id$
+# $FreeBSD$
 # Add any locally observed files here.  Remember:
 # text if readable, executable if runnable binary, data if unreadable.
diff --git a/usr.bin/file/Magdir/softquad b/usr.bin/file/Magdir/softquad
index f570b0974f3f..0fd952a2ee43 100644
--- a/usr.bin/file/Magdir/softquad
+++ b/usr.bin/file/Magdir/softquad
@@ -2,7 +2,7 @@
 #------------------------------------------------------------------------------
 # softquad:  file(1) magic for SoftQuad Publishing Software
 #
-# $Id$
+# $FreeBSD$
 # Author/Editor and RulesBuilder
 #
 # XXX - byte order?
diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile
index 2e00f0bc0861..3834e4b0b307 100644
--- a/usr.bin/file/Makefile
+++ b/usr.bin/file/Makefile
@@ -1,6 +1,6 @@
 # Makefile for file(1) cmd.
 # Copyright (c) Ian F. Darwin 86/09/01 - see LEGAL.NOTICE.
-# @(#)$Id: Makefile,v 1.11 1997/04/04 02:42:53 mpp Exp $
+# @(#)$FreeBSD$
 #
 # This software is not subject to any license of the American Telephone
 # and Telegraph Company or of the Regents of the University of California.
diff --git a/usr.bin/file/PORTING b/usr.bin/file/PORTING
index 1fa5da16e7c0..7e65021d2950 100644
--- a/usr.bin/file/PORTING
+++ b/usr.bin/file/PORTING
@@ -1,5 +1,5 @@
 Portability of the new file(1) command.
-@(#) $Id$
+@(#) $FreeBSD$
 
 Read this file only if the program doesn't compile on your system.
 
diff --git a/usr.bin/file/README b/usr.bin/file/README
index 21932922b2b1..9872176410be 100644
--- a/usr.bin/file/README
+++ b/usr.bin/file/README
@@ -1,5 +1,5 @@
 ** README for file(1) Command **
-@(#) $Id: README,v 1.1.1.2 1997/03/18 17:58:39 mpp Exp $
+@(#) $FreeBSD$
 
 This is Release 3.x of Ian Darwin's (copyright but distributable)
 file(1) command. This version is the standard "file" command for Linux,
diff --git a/usr.bin/file/apprentice.c b/usr.bin/file/apprentice.c
index 041ead0e717e..9c5b94547f55 100644
--- a/usr.bin/file/apprentice.c
+++ b/usr.bin/file/apprentice.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: apprentice.c,v 1.7 1998/01/28 07:36:21 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/file/ascmagic.c b/usr.bin/file/ascmagic.c
index a2b5d761039a..bf116999e3dc 100644
--- a/usr.bin/file/ascmagic.c
+++ b/usr.bin/file/ascmagic.c
@@ -28,7 +28,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/file/compress.c b/usr.bin/file/compress.c
index fba9c9119319..f1e8ae8b2510 100644
--- a/usr.bin/file/compress.c
+++ b/usr.bin/file/compress.c
@@ -8,7 +8,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/file/cvsimport.sh b/usr.bin/file/cvsimport.sh
index f9818fa7fb4e..0436074fc634 100644
--- a/usr.bin/file/cvsimport.sh
+++ b/usr.bin/file/cvsimport.sh
@@ -3,7 +3,7 @@
 # This shell script can be used in order to handle future imports
 # of newer versions of file(1)
 #
-# $Id: cvsimport.sh,v 1.3 1997/02/22 19:29:10 peter Exp $
+# $FreeBSD$
 if [ $# -ne 2 ] ; then 
 	echo "usage: $0 <major> <minor>" 1>&2
 	exit 1
diff --git a/usr.bin/file/file.1 b/usr.bin/file/file.1
index bb3221faed92..685afc242591 100644
--- a/usr.bin/file/file.1
+++ b/usr.bin/file/file.1
@@ -1,4 +1,4 @@
-.\" $Id: file.1,v 1.11 1998/01/28 07:36:22 charnier Exp $
+.\" $FreeBSD$
 .Dd July 30, 1997
 .Dt FILE 1 "Copyright but distributable"
 .Os
diff --git a/usr.bin/file/file.c b/usr.bin/file/file.c
index 485e398ee216..f420cac9f1c0 100644
--- a/usr.bin/file/file.c
+++ b/usr.bin/file/file.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/file/file.h b/usr.bin/file/file.h
index d62942e221c9..7d42ad88c712 100644
--- a/usr.bin/file/file.h
+++ b/usr.bin/file/file.h
@@ -1,6 +1,6 @@
 /*
  * file.h - definitions for file(1) program
- * @(#)$Id: file.h,v 1.8 1998/01/28 07:36:23 charnier Exp $
+ * @(#)$FreeBSD$
  *
  * Copyright (c) Ian F. Darwin, 1987.
  * Written by Ian F. Darwin.
diff --git a/usr.bin/file/fsmagic.c b/usr.bin/file/fsmagic.c
index b12a617b23ff..b9f690c10540 100644
--- a/usr.bin/file/fsmagic.c
+++ b/usr.bin/file/fsmagic.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: fsmagic.c,v 1.7 1998/01/28 07:36:23 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/file/internat.c b/usr.bin/file/internat.c
index ffb7aa2e21dc..f04208e08a01 100644
--- a/usr.bin/file/internat.c
+++ b/usr.bin/file/internat.c
@@ -1,7 +1,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "file.h"
diff --git a/usr.bin/file/is_tar.c b/usr.bin/file/is_tar.c
index 69d822d9beeb..362825f3e8d6 100644
--- a/usr.bin/file/is_tar.c
+++ b/usr.bin/file/is_tar.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/file/magic.5 b/usr.bin/file/magic.5
index 6355245187bb..12923ac0057a 100644
--- a/usr.bin/file/magic.5
+++ b/usr.bin/file/magic.5
@@ -1,5 +1,5 @@
 .\"
-.\" @(#)$Id: magic.5,v 1.8 1997/11/04 03:56:56 steve Exp $
+.\" @(#)$FreeBSD$
 .\"
 .\" install as magic.4 on USG, magic.5 on V7 or Berkeley systems.
 .\"
diff --git a/usr.bin/file/names.h b/usr.bin/file/names.h
index 1fed1bfa2a1b..1273375f6a49 100644
--- a/usr.bin/file/names.h
+++ b/usr.bin/file/names.h
@@ -10,7 +10,7 @@
  *
  * See LEGAL.NOTICE
  *
- * $Id: names.h,v 1.1.1.3 1997/03/18 17:58:52 mpp Exp $
+ * $FreeBSD$
  */
 
 /* these types are used to index the table 'types': keep em in sync! */
diff --git a/usr.bin/file/patchlevel.h b/usr.bin/file/patchlevel.h
index b6cea964c4bc..7fe74e7f1d65 100644
--- a/usr.bin/file/patchlevel.h
+++ b/usr.bin/file/patchlevel.h
@@ -3,7 +3,7 @@
 
 /*
  * Patchlevel file for Ian Darwin's MAGIC command.
- * $Id: patchlevel.h,v 1.7 1997/03/18 19:37:21 mpp Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/usr.bin/file/print.c b/usr.bin/file/print.c
index 5ccf07dc6afd..8cd079ad8fcd 100644
--- a/usr.bin/file/print.c
+++ b/usr.bin/file/print.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: print.c,v 1.7 1998/01/28 07:36:25 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/file/readelf.c b/usr.bin/file/readelf.c
index fb87af7a63df..5674402a4602 100644
--- a/usr.bin/file/readelf.c
+++ b/usr.bin/file/readelf.c
@@ -1,7 +1,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: readelf.c,v 1.4 1998/02/20 04:54:00 jb Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #ifdef BUILTIN_ELF
diff --git a/usr.bin/file/readelf.h b/usr.bin/file/readelf.h
index 853eed600f95..28d44976c241 100644
--- a/usr.bin/file/readelf.h
+++ b/usr.bin/file/readelf.h
@@ -1,6 +1,6 @@
 /*
  * readelf.h 
- * @(#)$Id: readelf.h,v 1.1.1.1 1997/03/18 17:58:55 mpp Exp $
+ * @(#)$FreeBSD$
  *
  * Provide elf data structures for non-elf machines, allowing file
  * non-elf hosts to determine if an elf binary is stripped.
diff --git a/usr.bin/file/softmagic.c b/usr.bin/file/softmagic.c
index 5227acd50d5d..c1e79257963c 100644
--- a/usr.bin/file/softmagic.c
+++ b/usr.bin/file/softmagic.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/file/tar.h b/usr.bin/file/tar.h
index 6a9e1dd22398..87f0d55f25ad 100644
--- a/usr.bin/file/tar.h
+++ b/usr.bin/file/tar.h
@@ -5,7 +5,7 @@
  *
  * Created 25 August 1985 by John Gilmore, ihnp4!hoptoad!gnu.
  *
- * $Id$ # checkin only
+ * $FreeBSD$ # checkin only
  */
 
 /*
diff --git a/usr.bin/file2c/Makefile b/usr.bin/file2c/Makefile
index 28cd21e83437..79fdc9267dce 100644
--- a/usr.bin/file2c/Makefile
+++ b/usr.bin/file2c/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	file2c
 MAN1=	file2c.1
diff --git a/usr.bin/file2c/file2c.1 b/usr.bin/file2c/file2c.1
index ef4e77b489b8..0cf0d42826a7 100644
--- a/usr.bin/file2c/file2c.1
+++ b/usr.bin/file2c/file2c.1
@@ -5,7 +5,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.  Poul-Henning Kamp
 .\" ---------------------------------------------------------------------------
 .\"
-.\" $Id: file2c.1,v 1.4 1997/06/23 04:51:58 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 28, 1995
 .Dt FILE2C 1
diff --git a/usr.bin/file2c/file2c.c b/usr.bin/file2c/file2c.c
index 232d51b8c650..f946bbd5cc82 100644
--- a/usr.bin/file2c/file2c.c
+++ b/usr.bin/file2c/file2c.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: file2c.c,v 1.3 1997/02/22 19:55:01 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/usr.bin/find/find.1 b/usr.bin/find/find.1
index a2de73f421e3..59e76ef28034 100644
--- a/usr.bin/find/find.1
+++ b/usr.bin/find/find.1
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)find.1	8.7 (Berkeley) 5/9/95
-.\"	$Id: find.1,v 1.19 1999/04/19 08:26:00 jkoshy Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 9, 1995
 .Dt FIND 1
diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c
index 0005cb6a808a..c6cb12ef1297 100644
--- a/usr.bin/find/option.c
+++ b/usr.bin/find/option.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)option.c	8.2 (Berkeley) 4/16/94";
 */
 static const char rcsid[] =
-	"$Id: option.c,v 1.6 1997/11/28 15:48:08 steve Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/finger/finger.1 b/usr.bin/finger/finger.1
index 1c43820a6854..4fa1860ce043 100644
--- a/usr.bin/finger/finger.1
+++ b/usr.bin/finger/finger.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)finger.1	8.3 (Berkeley) 5/5/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd August 1, 1997
 .Dt FINGER 1
diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c
index ec0e6b9889e5..77f365a537a1 100644
--- a/usr.bin/finger/finger.c
+++ b/usr.bin/finger/finger.c
@@ -55,7 +55,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)finger.c	8.5 (Berkeley) 5/4/95";
 #else
 static const char rcsid[] =
-	"$Id: finger.c,v 1.13 1999/05/08 00:46:04 obrien Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/finger/finger.h b/usr.bin/finger/finger.h
index a3209cba89d4..7d4d99f6fb6f 100644
--- a/usr.bin/finger/finger.h
+++ b/usr.bin/finger/finger.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)finger.h	8.1 (Berkeley) 6/6/93
- *	$Id$
+ * $FreeBSD$
  */
 
 typedef struct person {
diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c
index 5d8023f721bd..3d0a4091c070 100644
--- a/usr.bin/finger/lprint.c
+++ b/usr.bin/finger/lprint.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)lprint.c	8.3 (Berkeley) 4/28/95";
 #else
 static const char rcsid[] =
-	"$Id: lprint.c,v 1.8 1997/07/02 06:34:49 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/finger/net.c b/usr.bin/finger/net.c
index c4698b461c29..2903c063806f 100644
--- a/usr.bin/finger/net.c
+++ b/usr.bin/finger/net.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)net.c	8.4 (Berkeley) 4/28/95";
 #else
 static const char rcsid[] =
-	"$Id: net.c,v 1.10 1998/06/09 04:30:40 imp Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/finger/sprint.c b/usr.bin/finger/sprint.c
index 8c38d7c414fe..acf9dff350a3 100644
--- a/usr.bin/finger/sprint.c
+++ b/usr.bin/finger/sprint.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)sprint.c	8.3 (Berkeley) 4/28/95";
 #else
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c
index e391840cfefe..54c68f0f6f98 100644
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/28/95";
 #else
 static const char rcsid[] =
-	"$Id: util.c,v 1.6 1999/08/21 18:25:38 imp Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/fmt/fmt.1 b/usr.bin/fmt/fmt.1
index e7413905239a..2760430e5546 100644
--- a/usr.bin/fmt/fmt.1
+++ b/usr.bin/fmt/fmt.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fmt.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt FMT 1
diff --git a/usr.bin/fmt/fmt.c b/usr.bin/fmt/fmt.c
index 51cbe5cd1d62..94dd8c6de00d 100644
--- a/usr.bin/fmt/fmt.c
+++ b/usr.bin/fmt/fmt.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)fmt.c	8.1 (Berkeley) 7/20/93";
 #else
 static const char rcsid[] =
-	"$Id: fmt.c,v 1.10 1997/08/21 03:41:41 jlemon Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/fold/fold.1 b/usr.bin/fold/fold.1
index 3e020cf1cac3..a37121d6c8a7 100644
--- a/usr.bin/fold/fold.1
+++ b/usr.bin/fold/fold.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fold.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt FOLD 1
diff --git a/usr.bin/fold/fold.c b/usr.bin/fold/fold.c
index 080c9abfbcae..386caaffcea2 100644
--- a/usr.bin/fold/fold.c
+++ b/usr.bin/fold/fold.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)fold.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/fpr/fpr.1 b/usr.bin/fpr/fpr.1
index 7e9811258840..489885ed773f 100644
--- a/usr.bin/fpr/fpr.1
+++ b/usr.bin/fpr/fpr.1
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fpr.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt FPR 1
diff --git a/usr.bin/from/from.1 b/usr.bin/from/from.1
index 553b22682291..0078a9e6b5d6 100644
--- a/usr.bin/from/from.1
+++ b/usr.bin/from/from.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)from.1	8.2 (Berkeley) 12/30/93
-.\"	$Id: from.1,v 1.5 1999/07/26 23:12:12 green Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt FROM 1
diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c
index 4daa4c4a3a18..6b3320712f06 100644
--- a/usr.bin/from/from.c
+++ b/usr.bin/from/from.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)from.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: from.c,v 1.6 1999/07/26 23:12:12 green Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/fsplit/fsplit.1 b/usr.bin/fsplit/fsplit.1
index fe4d06b844a5..23a3ddfea62a 100644
--- a/usr.bin/fsplit/fsplit.1
+++ b/usr.bin/fsplit/fsplit.1
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fsplit.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt FSPLIT 1
diff --git a/usr.bin/fsplit/fsplit.c b/usr.bin/fsplit/fsplit.c
index 03cf08a46500..d80837efb506 100644
--- a/usr.bin/fsplit/fsplit.c
+++ b/usr.bin/fsplit/fsplit.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)fsplit.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: fsplit.c,v 1.3 1997/07/08 11:01:35 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/fstat/Makefile b/usr.bin/fstat/Makefile
index 6ff6ab1224c4..8e9e277d38d0 100644
--- a/usr.bin/fstat/Makefile
+++ b/usr.bin/fstat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.2 1997/08/22 14:22:31 jmg Exp $
+# $FreeBSD$
 
 PROG=	fstat
 CFLAGS+=-Wall
diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1
index fd005e580665..9354ec12891c 100644
--- a/usr.bin/fstat/fstat.1
+++ b/usr.bin/fstat/fstat.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fstat.1	8.3 (Berkeley) 2/25/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd February 25, 1994
 .Dt FSTAT 1
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index 424f1379daad..b8e0c973a470 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)fstat.c	8.3 (Berkeley) 5/2/95";
 #endif
 static const char rcsid[] =
-	"$Id: fstat.c,v 1.16 1998/07/06 21:01:16 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile
index c74e3adfc9b7..bbd82e253aa6 100644
--- a/usr.bin/ftp/Makefile
+++ b/usr.bin/ftp/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.8 1997/12/13 20:38:12 pst Exp $
+# $FreeBSD$
 #	$NetBSD: Makefile,v 1.15 1997/10/18 15:31:20 lukem Exp $
 #	from: @(#)Makefile	8.2 (Berkeley) 4/3/94
 
diff --git a/usr.bin/ftp/cmds.c b/usr.bin/ftp/cmds.c
index 04b7c43ffbc7..acc3c6bde69c 100644
--- a/usr.bin/ftp/cmds.c
+++ b/usr.bin/ftp/cmds.c
@@ -1,4 +1,4 @@
-/*	$Id: cmds.c,v 1.14 1998/02/14 15:38:29 steve Exp $	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: cmds.c,v 1.30.2.1 1997/11/18 00:58:26 mellon Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)cmds.c	8.6 (Berkeley) 10/9/94";
 #else
-__RCSID("$Id: cmds.c,v 1.14 1998/02/14 15:38:29 steve Exp $");
+__RCSID("$FreeBSD$");
 __RCSID_SOURCE("$NetBSD: cmds.c,v 1.30.2.1 1997/11/18 00:58:26 mellon Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/cmdtab.c b/usr.bin/ftp/cmdtab.c
index 37920e7d8bca..542d32053d95 100644
--- a/usr.bin/ftp/cmdtab.c
+++ b/usr.bin/ftp/cmdtab.c
@@ -1,4 +1,4 @@
-/*	$Id$	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: cmdtab.c,v 1.17 1997/08/18 10:20:17 lukem Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)cmdtab.c	8.4 (Berkeley) 10/9/94";
 #else
-__RCSID("$Id$");
+__RCSID("$FreeBSD$");
 __RCSID_SOURCE("$NetBSD: cmdtab.c,v 1.17 1997/08/18 10:20:17 lukem Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/complete.c b/usr.bin/ftp/complete.c
index 901a916d7bab..ee0453f61e15 100644
--- a/usr.bin/ftp/complete.c
+++ b/usr.bin/ftp/complete.c
@@ -1,4 +1,4 @@
-/*	$Id$	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: complete.c,v 1.11 1997/09/13 09:05:53 lukem Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$Id$");
+__RCSID("$FreeBSD$");
 __RCSID_SOURCE("$NetBSD: complete.c,v 1.11 1997/09/13 09:05:53 lukem Exp $");
 #endif /* not lint */
 
diff --git a/usr.bin/ftp/domacro.c b/usr.bin/ftp/domacro.c
index c5ddc92061d7..907af4583b9a 100644
--- a/usr.bin/ftp/domacro.c
+++ b/usr.bin/ftp/domacro.c
@@ -1,4 +1,4 @@
-/*	$Id$	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: domacro.c,v 1.10 1997/07/20 09:45:45 lukem Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)domacro.c	8.3 (Berkeley) 4/2/94";
 #else
-__RCSID("$Id$");
+__RCSID("$FreeBSD$");
 __RCSID_SOURCE("$NetBSD: domacro.c,v 1.10 1997/07/20 09:45:45 lukem Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/extern.h b/usr.bin/ftp/extern.h
index a334c0b6744c..a8ac97b8c866 100644
--- a/usr.bin/ftp/extern.h
+++ b/usr.bin/ftp/extern.h
@@ -1,4 +1,4 @@
-/*	$Id: extern.h,v 1.6 1997/12/13 20:38:15 pst Exp $	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: extern.h,v 1.17.2.1 1997/11/18 00:59:50 mellon Exp $	*/
 
 /*-
diff --git a/usr.bin/ftp/fetch.c b/usr.bin/ftp/fetch.c
index a675886ccb7e..1d73c0f9655e 100644
--- a/usr.bin/ftp/fetch.c
+++ b/usr.bin/ftp/fetch.c
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$Id: fetch.c,v 1.5 1997/12/16 08:58:15 ache Exp $");
+__RCSID("$FreeBSD$");
 __RCSID_SOURCE("$NetBSD: fetch.c,v 1.16.2.1 1997/11/18 01:00:22 mellon Exp $");
 #endif /* not lint */
 
diff --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1
index 05981aec01cf..59b371f34b7b 100644
--- a/usr.bin/ftp/ftp.1
+++ b/usr.bin/ftp/ftp.1
@@ -1,4 +1,4 @@
-.\" 	$Id: ftp.1,v 1.10 1999/07/01 14:32:07 ru Exp $
+.\" $FreeBSD$
 .\" 	$NetBSD: ftp.1,v 1.21 1997/06/10 21:59:58 lukem Exp $
 .\"
 .\" Copyright (c) 1985, 1989, 1990, 1993
diff --git a/usr.bin/ftp/ftp.c b/usr.bin/ftp/ftp.c
index 154f6942f5d6..d2edd014d54b 100644
--- a/usr.bin/ftp/ftp.c
+++ b/usr.bin/ftp/ftp.c
@@ -1,4 +1,4 @@
-/*	$Id: ftp.c,v 1.15 1998/12/09 20:49:20 eivind Exp $	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: ftp.c,v 1.29.2.1 1997/11/18 01:01:04 mellon Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)ftp.c	8.6 (Berkeley) 10/27/94";
 #else
-__RCSID("$Id: ftp.c,v 1.15 1998/12/09 20:49:20 eivind Exp $");
+__RCSID("$FreeBSD$");
 __RCSID_SOURCE("$NetBSD: ftp.c,v 1.29.2.1 1997/11/18 01:01:04 mellon Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/ftp_var.h b/usr.bin/ftp/ftp_var.h
index 2a4f2c8615ea..d26d22df7f14 100644
--- a/usr.bin/ftp/ftp_var.h
+++ b/usr.bin/ftp/ftp_var.h
@@ -1,4 +1,4 @@
-/*	$Id: ftp_var.h,v 1.6 1997/12/13 20:38:18 pst Exp $	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: ftp_var.h,v 1.20.2.1 1997/11/18 01:01:37 mellon Exp $	*/
 
 /*
diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c
index f8b21d71debf..f2cad20744c1 100644
--- a/usr.bin/ftp/main.c
+++ b/usr.bin/ftp/main.c
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.18 1999/06/25 14:11:15 ru Exp $	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: main.c,v 1.26 1997/10/14 16:31:22 christos Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ __COPYRIGHT("@(#) Copyright (c) 1985, 1989, 1993, 1994\n\
 #if 0
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 10/9/94";
 #else
-__RCSID("$Id: main.c,v 1.18 1999/06/25 14:11:15 ru Exp $");
+__RCSID("$FreeBSD$");
 __RCSID_SOURCE("$NetBSD: main.c,v 1.26 1997/10/14 16:31:22 christos Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/pathnames.h b/usr.bin/ftp/pathnames.h
index bc649d68efc4..bf71177a33d4 100644
--- a/usr.bin/ftp/pathnames.h
+++ b/usr.bin/ftp/pathnames.h
@@ -1,4 +1,4 @@
-/*	$Id: pathnames.h,v 1.2 1997/06/25 08:56:43 msmith Exp $	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: pathnames.h,v 1.7 1997/01/09 20:19:40 tls Exp $	*/
 
 /*
diff --git a/usr.bin/ftp/ruserpass.c b/usr.bin/ftp/ruserpass.c
index c0e7f95cbea6..84355d320e17 100644
--- a/usr.bin/ftp/ruserpass.c
+++ b/usr.bin/ftp/ruserpass.c
@@ -1,4 +1,4 @@
-/*	$Id: ruserpass.c,v 1.7 1997/12/13 20:38:20 pst Exp $	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: ruserpass.c,v 1.14.2.1 1997/11/18 01:02:05 mellon Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)ruserpass.c	8.4 (Berkeley) 4/27/95";
 #else
-__RCSID("$Id: ruserpass.c,v 1.7 1997/12/13 20:38:20 pst Exp $");
+__RCSID("$FreeBSD$");
 __RCSID_SOURCE("$NetBSD: ruserpass.c,v 1.14.2.1 1997/11/18 01:02:05 mellon Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/util.c b/usr.bin/ftp/util.c
index 45baf324d705..24024a19342d 100644
--- a/usr.bin/ftp/util.c
+++ b/usr.bin/ftp/util.c
@@ -1,4 +1,4 @@
-/*	$Id: util.c,v 1.6 1998/07/19 00:01:24 jmz Exp $	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: util.c,v 1.16.2.1 1997/11/18 01:02:33 mellon Exp $	*/
 
 /*
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$Id: util.c,v 1.6 1998/07/19 00:01:24 jmz Exp $");
+__RCSID("$FreeBSD$");
 __RCSID_SOURCE("$NetBSD: util.c,v 1.16.2.1 1997/11/18 01:02:33 mellon Exp $");
 #endif /* not lint */
 
diff --git a/usr.bin/gcore/aoutcore.c b/usr.bin/gcore/aoutcore.c
index 6d8f9d358cc8..6ad9568ede3f 100644
--- a/usr.bin/gcore/aoutcore.c
+++ b/usr.bin/gcore/aoutcore.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)gcore.c	8.2 (Berkeley) 9/23/93";
 #endif
 static const char rcsid[] =
-	"$Id: gcore.c,v 1.13 1998/11/01 06:35:36 jdp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/gcore/elfcore.c b/usr.bin/gcore/elfcore.c
index f612232b458a..f66e584ac146 100644
--- a/usr.bin/gcore/elfcore.c
+++ b/usr.bin/gcore/elfcore.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: elfcore.c,v 1.2 1998/11/01 06:35:36 jdp Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/usr.bin/gcore/gcore.1 b/usr.bin/gcore/gcore.1
index a4d3e3cb9e89..ed3d0d628138 100644
--- a/usr.bin/gcore/gcore.1
+++ b/usr.bin/gcore/gcore.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)gcore.1	8.2 (Berkeley) 4/18/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt GCORE 1
diff --git a/usr.bin/gcore/gcore.c b/usr.bin/gcore/gcore.c
index 6d8f9d358cc8..6ad9568ede3f 100644
--- a/usr.bin/gcore/gcore.c
+++ b/usr.bin/gcore/gcore.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)gcore.c	8.2 (Berkeley) 9/23/93";
 #endif
 static const char rcsid[] =
-	"$Id: gcore.c,v 1.13 1998/11/01 06:35:36 jdp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/gcore/md-nop.c b/usr.bin/gcore/md-nop.c
index b7dcdc4a73fc..331901c1841c 100644
--- a/usr.bin/gcore/md-nop.c
+++ b/usr.bin/gcore/md-nop.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)md-nop.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/gencat/Makefile b/usr.bin/gencat/Makefile
index 44ed94145c35..45af07adf895 100644
--- a/usr.bin/gencat/Makefile
+++ b/usr.bin/gencat/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 1997/02/22 19:55:04 peter Exp $
+# $FreeBSD$
 
 PROG=	gencat
 SRCS=	gencat.c genlib.c
diff --git a/usr.bin/gencat/gencat.1 b/usr.bin/gencat/gencat.1
index c9959e332396..b7936c6ef128 100644
--- a/usr.bin/gencat/gencat.1
+++ b/usr.bin/gencat/gencat.1
@@ -24,7 +24,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: gencat.1,v 1.2 1998/11/18 04:30:53 jkoshy Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 11, 1997
 .Dt GENCAT 1
diff --git a/usr.bin/gensetdefs/Makefile b/usr.bin/gensetdefs/Makefile
index 0ea2b678a9f4..00dd6aaf7da1 100644
--- a/usr.bin/gensetdefs/Makefile
+++ b/usr.bin/gensetdefs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1999/05/04 20:31:26 ghelmer Exp $
+# $FreeBSD$
 
 PROG=	gensetdefs
 MAN8=	gensetdefs.8
diff --git a/usr.bin/gensetdefs/gensetdefs.8 b/usr.bin/gensetdefs/gensetdefs.8
index ecbfe3a3668b..8b0bf59073a0 100644
--- a/usr.bin/gensetdefs/gensetdefs.8
+++ b/usr.bin/gensetdefs/gensetdefs.8
@@ -1,5 +1,5 @@
 .\"
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .Dd March 10, 1999
 .Dt GENSETDEFS 8
diff --git a/usr.bin/gensetdefs/gensetdefs.c b/usr.bin/gensetdefs/gensetdefs.c
index 9a35e097cebf..7e36992214f7 100644
--- a/usr.bin/gensetdefs/gensetdefs.c
+++ b/usr.bin/gensetdefs/gensetdefs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/global/Makefile b/usr.bin/global/Makefile
index 8676dc3ceaf2..a37a2f967cda 100644
--- a/usr.bin/global/Makefile
+++ b/usr.bin/global/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 1997/12/15 02:28:04 skynyrd Exp $
+# $FreeBSD$
 
 SUBDIR= lib global gtags gctags btreeop htags systags
 
diff --git a/usr.bin/global/Makefile.inc b/usr.bin/global/Makefile.inc
index 34657a06430a..0e33fa03b8fe 100644
--- a/usr.bin/global/Makefile.inc
+++ b/usr.bin/global/Makefile.inc
@@ -1,4 +1,4 @@
-# $Id: Makefile.inc,v 1.5 1999/01/18 07:38:09 simokawa Exp $
+# $FreeBSD$
 
 .if !defined(GLOBAL_MAKEFILE_INC_BEEN_HERE)
 
diff --git a/usr.bin/global/btreeop/Makefile b/usr.bin/global/btreeop/Makefile
index 12f4357e7bbe..da762b8ccbbb 100644
--- a/usr.bin/global/btreeop/Makefile
+++ b/usr.bin/global/btreeop/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 1997/12/17 15:18:49 cwt Exp $
+# $FreeBSD$
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/btreeop
diff --git a/usr.bin/global/gctags/Makefile b/usr.bin/global/gctags/Makefile
index b66694a58d1f..48ae79232d68 100644
--- a/usr.bin/global/gctags/Makefile
+++ b/usr.bin/global/gctags/Makefile
@@ -1,5 +1,5 @@
 
-# $Id: Makefile,v 1.4 1997/12/17 15:18:52 cwt Exp $
+# $FreeBSD$
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/gctags
diff --git a/usr.bin/global/global/Makefile b/usr.bin/global/global/Makefile
index 0deeda464303..61c4d092ab73 100644
--- a/usr.bin/global/global/Makefile
+++ b/usr.bin/global/global/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 1997/12/17 15:18:53 cwt Exp $
+# $FreeBSD$
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/global
diff --git a/usr.bin/global/gtags/Makefile b/usr.bin/global/gtags/Makefile
index 05f506f77ce1..ab3fc7624f49 100644
--- a/usr.bin/global/gtags/Makefile
+++ b/usr.bin/global/gtags/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 1997/12/17 15:18:54 cwt Exp $
+# $FreeBSD$
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/gtags
diff --git a/usr.bin/global/htags/Makefile b/usr.bin/global/htags/Makefile
index c842decafa7a..197d5bb6ad47 100644
--- a/usr.bin/global/htags/Makefile
+++ b/usr.bin/global/htags/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 1997/12/15 02:28:19 skynyrd Exp $
+# $FreeBSD$
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/htags
diff --git a/usr.bin/global/lib/Makefile b/usr.bin/global/lib/Makefile
index 793f953cb09f..ad6b48d8ecdb 100644
--- a/usr.bin/global/lib/Makefile
+++ b/usr.bin/global/lib/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 1997/12/21 08:31:50 cwt Exp $
+# $FreeBSD$
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/lib
diff --git a/usr.bin/global/systags/Makefile b/usr.bin/global/systags/Makefile
index c2b06a1d1175..ed125c424c68 100644
--- a/usr.bin/global/systags/Makefile
+++ b/usr.bin/global/systags/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 1997/12/15 23:34:57 cwt Exp $
+# $FreeBSD$
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/systags
diff --git a/usr.bin/gprof/arcs.c b/usr.bin/gprof/arcs.c
index 6a7b17ef82b5..c6e77103e739 100644
--- a/usr.bin/gprof/arcs.c
+++ b/usr.bin/gprof/arcs.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)arcs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: arcs.c,v 1.4 1997/07/11 06:11:35 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/gprof/gprof.1 b/usr.bin/gprof/gprof.1
index 90b9ec95eef0..df83a70025d1 100644
--- a/usr.bin/gprof/gprof.1
+++ b/usr.bin/gprof/gprof.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)gprof.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt GPROF 1
diff --git a/usr.bin/gprof/gprof.c b/usr.bin/gprof/gprof.c
index 2b6285184d42..dfb1e2c82a7f 100644
--- a/usr.bin/gprof/gprof.c
+++ b/usr.bin/gprof/gprof.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)gprof.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: gprof.c,v 1.9 1999/05/23 00:37:54 jmz Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/gprof/printgprof.c b/usr.bin/gprof/printgprof.c
index 9c122bb19bca..0fb74f44ce98 100644
--- a/usr.bin/gprof/printgprof.c
+++ b/usr.bin/gprof/printgprof.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)printgprof.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/gprof/printlist.c b/usr.bin/gprof/printlist.c
index 15af8e198521..c77b19fa008b 100644
--- a/usr.bin/gprof/printlist.c
+++ b/usr.bin/gprof/printlist.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)printlist.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/head/head.1 b/usr.bin/head/head.1
index 2a23d53eeb55..8e333a5d3ab7 100644
--- a/usr.bin/head/head.1
+++ b/usr.bin/head/head.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)head.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt HEAD 1
diff --git a/usr.bin/head/head.c b/usr.bin/head/head.c
index fc4bdf61664b..e93896bc3ef0 100644
--- a/usr.bin/head/head.c
+++ b/usr.bin/head/head.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)head.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: head.c,v 1.8 1997/07/11 06:13:18 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/hexdump/display.c b/usr.bin/hexdump/display.c
index b72da84ce8c7..2d3bdcbd964a 100644
--- a/usr.bin/hexdump/display.c
+++ b/usr.bin/hexdump/display.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)display.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: display.c,v 1.2 1997/07/10 06:48:12 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/hexdump/hexdump.1 b/usr.bin/hexdump/hexdump.1
index 1fd6d07c14c1..a743a5082e27 100644
--- a/usr.bin/hexdump/hexdump.1
+++ b/usr.bin/hexdump/hexdump.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hexdump.1	8.2 (Berkeley) 4/18/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt HEXDUMP 1
diff --git a/usr.bin/hexdump/hexdump.c b/usr.bin/hexdump/hexdump.c
index 8491c42d0d52..c8ce78de8c3a 100644
--- a/usr.bin/hexdump/hexdump.c
+++ b/usr.bin/hexdump/hexdump.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)hexdump.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: hexdump.c,v 1.2 1997/07/10 06:48:16 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/hexdump/hexsyntax.c b/usr.bin/hexdump/hexsyntax.c
index ae21411fa694..f3bf5878dafe 100644
--- a/usr.bin/hexdump/hexsyntax.c
+++ b/usr.bin/hexdump/hexsyntax.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)hexsyntax.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/hexdump/od.1 b/usr.bin/hexdump/od.1
index 001b90088c7d..87cea73a83ab 100644
--- a/usr.bin/hexdump/od.1
+++ b/usr.bin/hexdump/od.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)od.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: od.1,v 1.5 1997/02/22 19:55:07 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 27, 1994
 .Os
diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c
index 7636ab80a439..65a160e64453 100644
--- a/usr.bin/hexdump/odsyntax.c
+++ b/usr.bin/hexdump/odsyntax.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)odsyntax.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: odsyntax.c,v 1.6 1997/11/04 05:33:14 ache Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/hexdump/parse.c b/usr.bin/hexdump/parse.c
index 34a223649e60..d02cd09a0185 100644
--- a/usr.bin/hexdump/parse.c
+++ b/usr.bin/hexdump/parse.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: parse.c,v 1.2 1997/07/10 06:48:24 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/host/Makefile b/usr.bin/host/Makefile
index 70a87aa51c52..9f521895ddab 100644
--- a/usr.bin/host/Makefile
+++ b/usr.bin/host/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 1997/02/22 19:55:08 peter Exp $
+# $FreeBSD$
 
 .include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
 
diff --git a/usr.bin/id/groups.1 b/usr.bin/id/groups.1
index a19c5935bd18..48bbff64d07b 100644
--- a/usr.bin/id/groups.1
+++ b/usr.bin/id/groups.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)groups.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt GROUPS 1
diff --git a/usr.bin/id/groups.sh b/usr.bin/id/groups.sh
index 904f200fcac5..b6350be8057e 100644
--- a/usr.bin/id/groups.sh
+++ b/usr.bin/id/groups.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)groups.sh	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PATH=/bin:/usr/bin; export PATH
 
diff --git a/usr.bin/id/id.1 b/usr.bin/id/id.1
index 56fdcb7c9b56..de43f87ee2c2 100644
--- a/usr.bin/id/id.1
+++ b/usr.bin/id/id.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)id.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: id.1,v 1.4 1998/02/28 21:37:54 alex Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt ID 1
diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c
index 2b6c96b407bc..c609a0f7c90b 100644
--- a/usr.bin/id/id.c
+++ b/usr.bin/id/id.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)id.c	8.2 (Berkeley) 2/16/94";
 #endif
 static const char rcsid[] =
-	"$Id: id.c,v 1.7 1998/08/21 06:47:58 obrien Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/id/whoami.1 b/usr.bin/id/whoami.1
index 125a05ee8d98..16e542e41d83 100644
--- a/usr.bin/id/whoami.1
+++ b/usr.bin/id/whoami.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)whoami.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt WHOAMI 1
diff --git a/usr.bin/id/whoami.sh b/usr.bin/id/whoami.sh
index 1c24bcc71989..9b18bac19953 100644
--- a/usr.bin/id/whoami.sh
+++ b/usr.bin/id/whoami.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)whoami.sh	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PATH=/bin:/usr/bin; export PATH
 
diff --git a/usr.bin/indent/args.c b/usr.bin/indent/args.c
index 376a6030a292..7a646c0fcfd9 100644
--- a/usr.bin/indent/args.c
+++ b/usr.bin/indent/args.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)args.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/indent/indent.1 b/usr.bin/indent/indent.1
index 71fb6bc8d032..b7af9b4c2af3 100644
--- a/usr.bin/indent/indent.1
+++ b/usr.bin/indent/indent.1
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)indent.1	8.1 (Berkeley) 7/1/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd July 1, 1993
 .Dt INDENT 1
diff --git a/usr.bin/indent/indent.c b/usr.bin/indent/indent.c
index c903d705765e..02d34445ee75 100644
--- a/usr.bin/indent/indent.c
+++ b/usr.bin/indent/indent.c
@@ -46,7 +46,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)indent.c	5.17 (Berkeley) 6/7/93";
 #endif
 static const char rcsid[] =
-	"$Id: indent.c,v 1.3 1998/10/18 04:46:24 thepish Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/indent/io.c b/usr.bin/indent/io.c
index 11c9a8d7ad54..596c849d6c35 100644
--- a/usr.bin/indent/io.c
+++ b/usr.bin/indent/io.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)io.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: io.c,v 1.3 1997/07/15 09:50:59 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/ipcrm/Makefile b/usr.bin/ipcrm/Makefile
index 6cc7bda7d56d..9c0e45c0702c 100644
--- a/usr.bin/ipcrm/Makefile
+++ b/usr.bin/ipcrm/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	ipcrm
 
diff --git a/usr.bin/ipcrm/ipcrm.1 b/usr.bin/ipcrm/ipcrm.1
index 7dd2c830908c..78e4054a02fc 100644
--- a/usr.bin/ipcrm/ipcrm.1
+++ b/usr.bin/ipcrm/ipcrm.1
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\" 
-.\" $Id: ipcrm.1,v 1.5 1997/07/15 09:54:34 charnier Exp $
+.\" $FreeBSD$
 .\""
 .Dd August 8, 1994
 .Dt IPCRM 1
diff --git a/usr.bin/ipcrm/ipcrm.c b/usr.bin/ipcrm/ipcrm.c
index cca197e0bc8e..b52100f632bc 100644
--- a/usr.bin/ipcrm/ipcrm.c
+++ b/usr.bin/ipcrm/ipcrm.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/ipcs/Makefile b/usr.bin/ipcs/Makefile
index 5e4afcc5c781..665371074767 100644
--- a/usr.bin/ipcs/Makefile
+++ b/usr.bin/ipcs/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	ipcs
 BINGRP=	kmem
diff --git a/usr.bin/ipcs/ipcs.1 b/usr.bin/ipcs/ipcs.1
index e4d441c4a3f4..b52961465f65 100644
--- a/usr.bin/ipcs/ipcs.1
+++ b/usr.bin/ipcs/ipcs.1
@@ -27,7 +27,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: ipcs.1,v 1.7 1997/07/15 09:55:58 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 18, 1994
 .Dt "IPCS" 1
diff --git a/usr.bin/ipcs/ipcs.c b/usr.bin/ipcs/ipcs.c
index 5eee8b1c5027..a752e6cbf360 100644
--- a/usr.bin/ipcs/ipcs.c
+++ b/usr.bin/ipcs/ipcs.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/join/join.1 b/usr.bin/join/join.1
index 7e0b5bd78793..a95454b17b7f 100644
--- a/usr.bin/join/join.1
+++ b/usr.bin/join/join.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)join.1	8.3 (Berkeley) 4/28/95
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 28, 1995
 .Dt JOIN 1
diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c
index a0229b538a90..4b4add9bc1d6 100644
--- a/usr.bin/join/join.c
+++ b/usr.bin/join/join.c
@@ -46,7 +46,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)join.c	8.6 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: join.c,v 1.8 1997/08/19 15:58:15 jlemon Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/jot/jot.1 b/usr.bin/jot/jot.1
index d0f0ce457fc2..d8419c71b0c0 100644
--- a/usr.bin/jot/jot.1
+++ b/usr.bin/jot/jot.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)jot.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: jot.1,v 1.5 1999/07/12 20:23:37 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt JOT 1
diff --git a/usr.bin/jot/jot.c b/usr.bin/jot/jot.c
index 7d96f2b22f67..12b5998cac94 100644
--- a/usr.bin/jot/jot.c
+++ b/usr.bin/jot/jot.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)jot.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: jot.c,v 1.10 1999/07/22 17:11:59 sheldonh Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/kdump/kdump.1 b/usr.bin/kdump/kdump.1
index ac47abf887b6..b4df3ebb698b 100644
--- a/usr.bin/kdump/kdump.1
+++ b/usr.bin/kdump/kdump.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)kdump.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: kdump.1,v 1.3 1997/04/27 08:45:44 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt KDUMP 1
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index c8d46025d599..7fad0f3f7eea 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)kdump.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: kdump.c,v 1.14 1999/06/26 07:31:13 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #define KERNEL
diff --git a/usr.bin/key/key.1 b/usr.bin/key/key.1
index 56a6e1c0838c..a20dd419d558 100644
--- a/usr.bin/key/key.1
+++ b/usr.bin/key/key.1
@@ -1,5 +1,5 @@
 .\"	from: @(#)key.1	1.0 (Bellcore) 12/2/91
-.\" $Id: key.1,v 1.3 1997/07/16 06:51:12 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 2, 1991
 .Dt KEY 1
diff --git a/usr.bin/keyinfo/keyinfo.1 b/usr.bin/keyinfo/keyinfo.1
index 5b6a6c5b6817..775043736354 100644
--- a/usr.bin/keyinfo/keyinfo.1
+++ b/usr.bin/keyinfo/keyinfo.1
@@ -1,5 +1,5 @@
 .\"	from: @(#)keyinfo.1	1.1 (Bellcore) 7/20/93
-.\"	$Id: keyinfo.1,v 1.5 1997/07/16 06:52:13 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 26, 1996
 .Dt KEYINFO 1
diff --git a/usr.bin/keyinfo/keyinfo.pl b/usr.bin/keyinfo/keyinfo.pl
index 260a72479f98..8316c5896505 100644
--- a/usr.bin/keyinfo/keyinfo.pl
+++ b/usr.bin/keyinfo/keyinfo.pl
@@ -3,7 +3,7 @@
 # Search /etc/skeykeys for the skey string for this user OR user specified
 # in 1st parameter.
 #
-# $Id$
+# $FreeBSD$
 #
 
 die "usage: keyinfo [user]\n" unless $#ARGV < 1;
diff --git a/usr.bin/keyinit/keyinit.1 b/usr.bin/keyinit/keyinit.1
index 8513507faef5..ee3dba152038 100644
--- a/usr.bin/keyinit/keyinit.1
+++ b/usr.bin/keyinit/keyinit.1
@@ -1,5 +1,5 @@
 .\"	@(#)keyinit.1	1.0 (Bellcore) 7/20/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd July 20, 1993
 .Dt KEYINIT 1
diff --git a/usr.bin/keylogin/Makefile b/usr.bin/keylogin/Makefile
index 1c3b861ab67c..bf279eb25b22 100644
--- a/usr.bin/keylogin/Makefile
+++ b/usr.bin/keylogin/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	keylogin
 
diff --git a/usr.bin/keylogin/keylogin.1 b/usr.bin/keylogin/keylogin.1
index e20ddfab469d..501d002cffba 100644
--- a/usr.bin/keylogin/keylogin.1
+++ b/usr.bin/keylogin/keylogin.1
@@ -1,6 +1,6 @@
 .\" @(#)keylogin.1 1.5 91/03/11 TIRPC 1.0;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .Dd September 9, 1987
 .Dt KEYLOGIN 1
diff --git a/usr.bin/keylogout/Makefile b/usr.bin/keylogout/Makefile
index e3743ad6029e..cc433e444669 100644
--- a/usr.bin/keylogout/Makefile
+++ b/usr.bin/keylogout/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	keylogout
 
diff --git a/usr.bin/keylogout/keylogout.1 b/usr.bin/keylogout/keylogout.1
index 373304b2b402..7a3503e55e0a 100644
--- a/usr.bin/keylogout/keylogout.1
+++ b/usr.bin/keylogout/keylogout.1
@@ -1,4 +1,4 @@
-.\" $Id$
+.\" $FreeBSD$
 .\" @(#)keylogout.1 1.4 91/03/11 TIRPC 1.0; from 1.3 89/07/26 SMI;
 .Dd April 15, 1989
 .Dt KEYLOGOUT 1
diff --git a/usr.bin/keylogout/keylogout.c b/usr.bin/keylogout/keylogout.c
index 86d391bc7070..d5276d2e168f 100644
--- a/usr.bin/keylogout/keylogout.c
+++ b/usr.bin/keylogout/keylogout.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/killall/Makefile b/usr.bin/killall/Makefile
index b7b319627392..0a0ced7d0db2 100644
--- a/usr.bin/killall/Makefile
+++ b/usr.bin/killall/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 MAINTAINER= wosch
 
 MAN1=	killall.1
diff --git a/usr.bin/killall/killall.1 b/usr.bin/killall/killall.1
index 2e51e058bfbb..c7b3c3e0feb2 100644
--- a/usr.bin/killall/killall.1
+++ b/usr.bin/killall/killall.1
@@ -22,7 +22,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: killall.1,v 1.9 1997/11/01 15:06:40 wosch Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 25, 1995
 .Os FreeBSD 2.2 
diff --git a/usr.bin/killall/killall.pl b/usr.bin/killall/killall.pl
index e18489acf706..6238c7b49668 100755
--- a/usr.bin/killall/killall.pl
+++ b/usr.bin/killall/killall.pl
@@ -26,7 +26,7 @@
 #
 # killall - kill processes by name
 #
-# $Id: killall.pl,v 1.10 1998/08/30 16:54:58 wosch Exp $
+# $FreeBSD$
 
 
 $ENV{'PATH'} = '/bin:/usr/bin'; # security
diff --git a/usr.bin/ktrace/Makefile b/usr.bin/ktrace/Makefile
index b551a37d461a..c00bb7510459 100644
--- a/usr.bin/ktrace/Makefile
+++ b/usr.bin/ktrace/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	1.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.4 1997/02/22 19:55:27 peter Exp $
+# $FreeBSD$
 
 PROG=	ktrace
 SRCS=	ktrace.c subr.c
diff --git a/usr.bin/ktrace/ktrace.1 b/usr.bin/ktrace/ktrace.1
index 6708e3ca7d2d..20a461a39410 100644
--- a/usr.bin/ktrace/ktrace.1
+++ b/usr.bin/ktrace/ktrace.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ktrace.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: ktrace.1,v 1.6 1997/04/27 08:45:45 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt KTRACE 1
diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c
index f96c4fd45744..1c5a98ba6796 100644
--- a/usr.bin/ktrace/ktrace.c
+++ b/usr.bin/ktrace/ktrace.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)ktrace.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: ktrace.c,v 1.10 1997/03/29 04:30:16 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c
index 8af26bab5cfa..4e4b3bf466a5 100644
--- a/usr.bin/ktrace/subr.c
+++ b/usr.bin/ktrace/subr.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)subr.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/kzip/Makefile b/usr.bin/kzip/Makefile
index 7c9f8c3b438f..8ff6f7f09623 100644
--- a/usr.bin/kzip/Makefile
+++ b/usr.bin/kzip/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	kzip
 MAN8=	kzip.8
diff --git a/usr.bin/kzip/kzip.8 b/usr.bin/kzip/kzip.8
index f720da67fc1f..a966d365f314 100644
--- a/usr.bin/kzip/kzip.8
+++ b/usr.bin/kzip/kzip.8
@@ -23,7 +23,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: kzip.8,v 1.5 1998/03/23 07:44:18 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd August 15, 1996
 .Os
diff --git a/usr.bin/kzip/kzip.c b/usr.bin/kzip/kzip.c
index 74bd701751da..430dcc39f619 100644
--- a/usr.bin/kzip/kzip.c
+++ b/usr.bin/kzip/kzip.c
@@ -13,7 +13,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: kzip.c,v 1.11 1998/06/01 18:34:19 jhay Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/lam/lam.1 b/usr.bin/lam/lam.1
index 78b8ea025231..b1c9ed8aba1c 100644
--- a/usr.bin/lam/lam.1
+++ b/usr.bin/lam/lam.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)lam.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt LAM 1
diff --git a/usr.bin/lam/lam.c b/usr.bin/lam/lam.c
index 599337a71855..277081095af7 100644
--- a/usr.bin/lam/lam.c
+++ b/usr.bin/lam/lam.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)lam.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/last/last.1 b/usr.bin/last/last.1
index 8983fc19763d..27be940c0811 100644
--- a/usr.bin/last/last.1
+++ b/usr.bin/last/last.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)last.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt LAST 1
diff --git a/usr.bin/lastcomm/lastcomm.1 b/usr.bin/lastcomm/lastcomm.1
index 7e84c7ded476..33248e24b3c7 100644
--- a/usr.bin/lastcomm/lastcomm.1
+++ b/usr.bin/lastcomm/lastcomm.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)lastcomm.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: lastcomm.1,v 1.5 1997/02/22 19:55:32 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 18, 1996
 .Dt LASTCOMM 1
diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c
index 64aae8fa4860..4beed143c977 100644
--- a/usr.bin/lastcomm/lastcomm.c
+++ b/usr.bin/lastcomm/lastcomm.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)lastcomm.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ldd/Makefile b/usr.bin/ldd/Makefile
index a3a726944965..d7cd01069682 100644
--- a/usr.bin/ldd/Makefile
+++ b/usr.bin/ldd/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.9 1998/06/12 14:11:15 peter Exp $
+# $FreeBSD$
 
 PROG=		ldd
 SRCS=		ldd.c
diff --git a/usr.bin/ldd/ldd.c b/usr.bin/ldd/ldd.c
index 860b05336296..d565d607102f 100644
--- a/usr.bin/ldd/ldd.c
+++ b/usr.bin/ldd/ldd.c
@@ -27,7 +27,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: ldd.c,v 1.16 1998/08/30 18:30:59 jdp Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/ldd/sods.c b/usr.bin/ldd/sods.c
index 70784e6258b0..a41afaa63c13 100644
--- a/usr.bin/ldd/sods.c
+++ b/usr.bin/ldd/sods.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: sods.c,v 1.7 1998/05/01 08:40:11 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <assert.h>
diff --git a/usr.bin/leave/Makefile b/usr.bin/leave/Makefile
index 4c6129171217..eacf6f1e021d 100644
--- a/usr.bin/leave/Makefile
+++ b/usr.bin/leave/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $Id$
+# $FreeBSD$
 
 PROG=	leave
 CFLAGS+=-Wall
diff --git a/usr.bin/leave/leave.1 b/usr.bin/leave/leave.1
index 32b1999e76e8..f0cc56e726f5 100644
--- a/usr.bin/leave/leave.1
+++ b/usr.bin/leave/leave.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)leave.1	8.3 (Berkeley) 4/28/95
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 28, 1995
 .Dt LEAVE 1
diff --git a/usr.bin/leave/leave.c b/usr.bin/leave/leave.c
index c39269692683..d76465531fa4 100644
--- a/usr.bin/leave/leave.c
+++ b/usr.bin/leave/leave.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)leave.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: leave.c,v 1.3 1998/01/06 17:27:09 helbig Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile
index 5d98811d4840..855da64da498 100644
--- a/usr.bin/lex/Makefile
+++ b/usr.bin/lex/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.11 1997/10/05 09:39:58 jkh Exp $
+# $FreeBSD$
 #
 # By default, flex will be configured to generate 8-bit scanners only if the
 # -8 flag is given.  If you want it to always generate 8-bit scanners, add
diff --git a/usr.bin/lex/lib/Makefile b/usr.bin/lex/lib/Makefile
index 8fd744f3c9e8..0091cc2747bc 100644
--- a/usr.bin/lex/lib/Makefile
+++ b/usr.bin/lex/lib/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 1997/02/22 19:55:36 peter Exp $
+# $FreeBSD$
 
 LIB=    ln
 SRCS=   libmain.c libyywrap.c
diff --git a/usr.bin/limits/limits.1 b/usr.bin/limits/limits.1
index 29033ea1d77d..258dc55b3708 100644
--- a/usr.bin/limits/limits.1
+++ b/usr.bin/limits/limits.1
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\"	$Id: limits.1,v 1.11 1999/04/13 02:32:12 ghelmer Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 15, 1996
 .Dt LIMITS 1
diff --git a/usr.bin/limits/limits.c b/usr.bin/limits/limits.c
index e2f8bef620e4..b9de9a4c9cd7 100644
--- a/usr.bin/limits/limits.c
+++ b/usr.bin/limits/limits.c
@@ -20,7 +20,7 @@
  *
  * Display/change(+runprogram)/eval resource limits.
  *
- *	$Id: limits.c,v 1.4 1997/05/10 19:00:58 davidn Exp $
+ * $FreeBSD$
  */
 
 #include <err.h>
diff --git a/usr.bin/locate/Makefile b/usr.bin/locate/Makefile
index 2c82bee27aa6..1d495e420ece 100644
--- a/usr.bin/locate/Makefile
+++ b/usr.bin/locate/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.4 1997/02/22 19:55:40 peter Exp $
+# $FreeBSD$
 
 MAINTAINER= wosch
 
diff --git a/usr.bin/locate/Makefile.inc b/usr.bin/locate/Makefile.inc
index 0f80876250b2..48174083d848 100644
--- a/usr.bin/locate/Makefile.inc
+++ b/usr.bin/locate/Makefile.inc
@@ -1,3 +1,3 @@
-#	$Id$
+# $FreeBSD$
 
 LIBEXECDIR?=	/usr/libexec
diff --git a/usr.bin/locate/bigram/Makefile b/usr.bin/locate/bigram/Makefile
index bcb016e24a7f..e0018d89b7fd 100644
--- a/usr.bin/locate/bigram/Makefile
+++ b/usr.bin/locate/bigram/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	locate.bigram
 NOMAN=	noman
diff --git a/usr.bin/locate/bigram/locate.bigram.c b/usr.bin/locate/bigram/locate.bigram.c
index 663428a0526d..137b590697ae 100644
--- a/usr.bin/locate/bigram/locate.bigram.c
+++ b/usr.bin/locate/bigram/locate.bigram.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * 	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/locate/code/Makefile b/usr.bin/locate/code/Makefile
index 7e4c4fd573fe..fb1fb510e59a 100644
--- a/usr.bin/locate/code/Makefile
+++ b/usr.bin/locate/code/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	locate.code
 CFLAGS+=-I${.CURDIR}/../locate 
diff --git a/usr.bin/locate/code/locate.code.c b/usr.bin/locate/code/locate.code.c
index 47d20590dbad..c7cb09715fb4 100644
--- a/usr.bin/locate/code/locate.code.c
+++ b/usr.bin/locate/code/locate.code.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * 	$Id: locate.code.c,v 1.9 1997/02/22 19:55:43 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/locate/locate/Makefile b/usr.bin/locate/locate/Makefile
index c1b14bf657e9..064cf08a52be 100644
--- a/usr.bin/locate/locate/Makefile
+++ b/usr.bin/locate/locate/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	locate
 SRCS=	util.c locate.c
diff --git a/usr.bin/locate/locate/concatdb.sh b/usr.bin/locate/locate/concatdb.sh
index 86251a33ca75..75c683246ca4 100644
--- a/usr.bin/locate/locate/concatdb.sh
+++ b/usr.bin/locate/locate/concatdb.sh
@@ -30,7 +30,7 @@
 #
 # Sequence of databases is important.
 #
-# $Id: concatdb.sh,v 1.7 1998/03/08 15:28:32 wosch Exp $
+# $FreeBSD$
 
 # The directory containing locate subprograms
 : ${LIBEXECDIR:=/usr/libexec}; export LIBEXECDIR
diff --git a/usr.bin/locate/locate/fastfind.c b/usr.bin/locate/locate/fastfind.c
index d886ffa55667..68f8a86d2b2b 100644
--- a/usr.bin/locate/locate/fastfind.c
+++ b/usr.bin/locate/locate/fastfind.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: fastfind.c,v 1.10 1997/07/21 12:08:13 charnier Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/usr.bin/locate/locate/locate.1 b/usr.bin/locate/locate/locate.1
index 2519a0722c7f..e4cffa873aa3 100644
--- a/usr.bin/locate/locate/locate.1
+++ b/usr.bin/locate/locate/locate.1
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)locate.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: locate.1,v 1.10 1998/02/07 05:30:14 alex Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt LOCATE 1
diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c
index 819d8a50c926..a0ffe0dbdcc0 100644
--- a/usr.bin/locate/locate/locate.c
+++ b/usr.bin/locate/locate/locate.c
@@ -47,7 +47,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)locate.c    8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/locate/locate/locate.h b/usr.bin/locate/locate/locate.h
index 9e997d447231..24df8d4002be 100644
--- a/usr.bin/locate/locate/locate.h
+++ b/usr.bin/locate/locate/locate.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)locate.h	8.1 (Berkeley) 6/6/93
- *	$Id$
+ * $FreeBSD$
  */
 
 /* Symbolic constants shared by locate.c and code.c */
diff --git a/usr.bin/locate/locate/locate.rc b/usr.bin/locate/locate/locate.rc
index e1f400083ba9..57835b363a3c 100644
--- a/usr.bin/locate/locate/locate.rc
+++ b/usr.bin/locate/locate/locate.rc
@@ -1,7 +1,7 @@
 #
 # /etc/locate.rc -  command script for updatedb(8)
 #
-# $Id: locate.rc,v 1.6 1998/03/08 16:09:26 wosch Exp $
+# $FreeBSD$
 
 #
 # All commented values are the defaults
diff --git a/usr.bin/locate/locate/locate.updatedb.8 b/usr.bin/locate/locate/locate.updatedb.8
index 9e9bb1e8c1af..fad70894c050 100644
--- a/usr.bin/locate/locate/locate.updatedb.8
+++ b/usr.bin/locate/locate/locate.updatedb.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd February 11, 1996
 .Dt LOCATE.UPDATEDB 8
diff --git a/usr.bin/locate/locate/mklocatedb.sh b/usr.bin/locate/locate/mklocatedb.sh
index 864760e87ec7..4df3afa1386f 100644
--- a/usr.bin/locate/locate/mklocatedb.sh
+++ b/usr.bin/locate/locate/mklocatedb.sh
@@ -28,7 +28,7 @@
 # 
 # usage: mklocatedb [-presort] < filelist > database
 #
-# $Id: mklocatedb.sh,v 1.7 1998/03/08 16:09:28 wosch Exp $
+# $FreeBSD$
 
 # The directory containing locate subprograms
 : ${LIBEXECDIR:=/usr/libexec}; export LIBEXECDIR
diff --git a/usr.bin/locate/locate/updatedb.sh b/usr.bin/locate/locate/updatedb.sh
index 0eea10e3c2b7..fbf1e61b0a49 100644
--- a/usr.bin/locate/locate/updatedb.sh
+++ b/usr.bin/locate/locate/updatedb.sh
@@ -26,7 +26,7 @@
 #
 # updatedb - update locate database for local mounted filesystems
 #
-# $Id: updatedb.sh,v 1.14 1999/05/14 10:18:43 wosch Exp $
+# $FreeBSD$
 
 : ${LOCATE_CONFIG="/etc/locate.rc"}
 if [ -f "$LOCATE_CONFIG" -a -r "$LOCATE_CONFIG" ]; then
diff --git a/usr.bin/locate/locate/util.c b/usr.bin/locate/locate/util.c
index 87ad02f10574..38fe284a80f8 100644
--- a/usr.bin/locate/locate/util.c
+++ b/usr.bin/locate/locate/util.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: util.c,v 1.4 1997/02/22 19:55:50 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/usr.bin/lock/lock.1 b/usr.bin/lock/lock.1
index 8f707777f50e..d3538ed2fe0f 100644
--- a/usr.bin/lock/lock.1
+++ b/usr.bin/lock/lock.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)lock.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt LOCK 1
diff --git a/usr.bin/lock/lock.c b/usr.bin/lock/lock.c
index 786c31ac762b..d5b60ae10da1 100644
--- a/usr.bin/lock/lock.c
+++ b/usr.bin/lock/lock.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)lock.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: lock.c,v 1.4 1997/07/21 12:09:34 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/lockf/Makefile b/usr.bin/lockf/Makefile
index 47fb6ab863e1..77d89c45bbdf 100644
--- a/usr.bin/lockf/Makefile
+++ b/usr.bin/lockf/Makefile
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 
 PROG=	lockf
 CFLAGS+=-Wall
diff --git a/usr.bin/lockf/lockf.1 b/usr.bin/lockf/lockf.1
index 36b50de0cc84..e4fc80eb93dc 100644
--- a/usr.bin/lockf/lockf.1
+++ b/usr.bin/lockf/lockf.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: lockf.1,v 1.5 1998/03/23 07:44:28 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 7, 1998
 .Os FreeBSD
diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c
index 76b4870634dd..0a91048cafc4 100644
--- a/usr.bin/lockf/lockf.c
+++ b/usr.bin/lockf/lockf.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: lockf.c,v 1.6 1997/07/22 07:32:23 charnier Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/logger/logger.1 b/usr.bin/logger/logger.1
index 413b39af49ba..b2abd2ba2de2 100644
--- a/usr.bin/logger/logger.1
+++ b/usr.bin/logger/logger.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)logger.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt LOGGER 1
diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c
index c272ae269305..e7be77125506 100644
--- a/usr.bin/logger/logger.c
+++ b/usr.bin/logger/logger.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)logger.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index 595a2fc9fc81..2813ccbdfe30 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -1,5 +1,5 @@
 # From:	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $Id: Makefile,v 1.27 1999/01/20 21:58:46 jdp Exp $
+# $FreeBSD$
 
 PROG=	login
 MAN1=	login.1
diff --git a/usr.bin/login/login.1 b/usr.bin/login/login.1
index 7bea546b6dc9..2ee22ef7f0db 100644
--- a/usr.bin/login/login.1
+++ b/usr.bin/login/login.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)login.1	8.2 (Berkeley) 5/5/94
-.\"	$Id: login.1,v 1.13 1999/01/11 09:07:42 asami Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 5, 1994
 .Dt LOGIN 1
diff --git a/usr.bin/login/login.access.5 b/usr.bin/login/login.access.5
index ff6d21cc14fe..10788ed38e6f 100644
--- a/usr.bin/login/login.access.5
+++ b/usr.bin/login/login.access.5
@@ -1,5 +1,5 @@
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .\" this is comment
 .Dd April 30, 1994
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index 94a463d90ffa..7b7cc97b7d77 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)login.c	8.4 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: login.c,v 1.47 1999/04/24 17:26:32 ache Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/logname/logname.1 b/usr.bin/logname/logname.1
index d8de2ce01f46..e75afcb925ec 100644
--- a/usr.bin/logname/logname.1
+++ b/usr.bin/logname/logname.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)logname.1	8.1 (Berkeley) 6/9/93
-.\"	$Id: logname.1,v 1.3 1997/04/27 08:45:45 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt LOGNAME 1
diff --git a/usr.bin/look/look.1 b/usr.bin/look/look.1
index 32958aff71a3..ed688b467f37 100644
--- a/usr.bin/look/look.1
+++ b/usr.bin/look/look.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)look.1	8.1 (Berkeley) 6/14/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 14, 1993
 .Dt LOOK 1
diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c
index ddca4d02f698..ad2f35c4f3bf 100644
--- a/usr.bin/look/look.c
+++ b/usr.bin/look/look.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)look.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: look.c,v 1.9 1997/09/15 11:02:10 jkh Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/lorder/lorder.1 b/usr.bin/lorder/lorder.1
index 418556e414e1..68b074b2bdb5 100644
--- a/usr.bin/lorder/lorder.1
+++ b/usr.bin/lorder/lorder.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lorder.1	8.2 (Berkeley) 4/28/95
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 28, 1995
 .Dt LORDER 1
diff --git a/usr.bin/lsvfs/Makefile b/usr.bin/lsvfs/Makefile
index 3b25443ca3a2..b2b06113e666 100644
--- a/usr.bin/lsvfs/Makefile
+++ b/usr.bin/lsvfs/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 PROG=	lsvfs
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/lsvfs/lsvfs.1 b/usr.bin/lsvfs/lsvfs.1
index 3bd508350a33..bd075c85db55 100644
--- a/usr.bin/lsvfs/lsvfs.1
+++ b/usr.bin/lsvfs/lsvfs.1
@@ -1,4 +1,4 @@
-.\" $Id: lsvfs.1,v 1.5 1997/02/22 19:55:59 peter Exp $
+.\" $FreeBSD$
 .\" Garrett A. Wollman, September 1994
 .\" This file is in the public domain.
 .\"
diff --git a/usr.bin/lsvfs/lsvfs.c b/usr.bin/lsvfs/lsvfs.c
index d9889042d32a..cb6a032e634b 100644
--- a/usr.bin/lsvfs/lsvfs.c
+++ b/usr.bin/lsvfs/lsvfs.c
@@ -3,7 +3,7 @@
  * Garrett A. Wollman, September 1994
  * This file is in the public domain.
  *
- * $Id: lsvfs.c,v 1.11 1998/08/29 13:53:22 bde Exp $
+ * $FreeBSD$
  */
 
 #define _NEW_VFSCONF
diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c
index 5c51141e71b3..e863a13cbdff 100644
--- a/usr.bin/m4/eval.c
+++ b/usr.bin/m4/eval.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)eval.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: eval.c,v 1.8 1997/08/18 21:01:45 jlemon Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1
index 68d69295eb25..3e5551f4e283 100644
--- a/usr.bin/m4/m4.1
+++ b/usr.bin/m4/m4.1
@@ -1,5 +1,5 @@
 .\"
-.\"	@(#) $Id: m4.1,v 1.7 1998/12/13 23:15:50 steve Exp $
+.\"	@(#) $FreeBSD$
 .\"
 .Dd January 26, 1993
 .Dt M4 1
diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c
index d95f1f2215f6..41b7b1385fe9 100644
--- a/usr.bin/m4/main.c
+++ b/usr.bin/m4/main.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c
index 9e9c70e87698..452f849cf4d2 100644
--- a/usr.bin/m4/misc.c
+++ b/usr.bin/m4/misc.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index 81ea50be8861..7109ef44ab2a 100644
--- a/usr.bin/mail/mail.1
+++ b/usr.bin/mail/mail.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mail.1	8.2 (Berkeley) 12/30/93
-.\"	$Id: mail.1,v 1.14 1998/01/02 16:43:49 joerg Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt MAIL 1
diff --git a/usr.bin/mail/temp.c b/usr.bin/mail/temp.c
index 5101a74931ef..fd14c58e971b 100644
--- a/usr.bin/mail/temp.c
+++ b/usr.bin/mail/temp.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)temp.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: temp.c,v 1.4 1998/10/10 09:58:20 thepish Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "rcv.h"
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index 9f6b524a23f7..7530945384ee 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.2 (Berkeley) 12/28/90
-#	$Id: Makefile,v 1.10 1997/02/22 19:27:05 peter Exp $
+# $FreeBSD$
 
 PROG=	make
 CFLAGS+= -I${.CURDIR} ${CROSS_MAKE_FLAGS}
diff --git a/usr.bin/make/PSD.doc/Makefile b/usr.bin/make/PSD.doc/Makefile
index 432ff314964e..d9f5acd3a47a 100644
--- a/usr.bin/make/PSD.doc/Makefile
+++ b/usr.bin/make/PSD.doc/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
-#	$Id$
+# $FreeBSD$
 
 DIR=	psd/12.make
 SRCS=	tutorial.ms
diff --git a/usr.bin/make/PSD.doc/tutorial.ms b/usr.bin/make/PSD.doc/tutorial.ms
index 31de37865ec1..d4269ca06488 100644
--- a/usr.bin/make/PSD.doc/tutorial.ms
+++ b/usr.bin/make/PSD.doc/tutorial.ms
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tutorial.ms	8.1 (Berkeley) 8/18/93
-.\"	$Id: tutorial.ms,v 1.6 1997/02/22 19:27:31 peter Exp $
+.\" $FreeBSD$
 .\"
 .EH 'PSD:12-%''PMake \*- A Tutorial'
 .OH 'PMake \*- A Tutorial''PSD:12-%'
diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c
index 7f70daddfef6..5397e270a4bf 100644
--- a/usr.bin/make/arch.c
+++ b/usr.bin/make/arch.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: arch.c,v 1.10 1998/10/15 16:09:56 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/buf.c b/usr.bin/make/buf.c
index 8ed5aa754a92..74983452f698 100644
--- a/usr.bin/make/buf.c
+++ b/usr.bin/make/buf.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: buf.c,v 1.8 1997/02/22 19:27:06 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/buf.h b/usr.bin/make/buf.h
index 8721bfb6ac20..207262be48d5 100644
--- a/usr.bin/make/buf.h
+++ b/usr.bin/make/buf.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)buf.h	8.1 (Berkeley) 6/6/93
- *	$Id: buf.h,v 1.7 1997/02/22 19:27:06 peter Exp $
+ * $FreeBSD$
  */
 
 /*-
diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c
index e894699d25f8..ee13bf0d5421 100644
--- a/usr.bin/make/compat.c
+++ b/usr.bin/make/compat.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: compat.c,v 1.13 1999/07/31 20:38:22 hoek Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -43,7 +43,7 @@
 static char sccsid[] = "@(#)compat.c	8.2 (Berkeley) 3/19/94";
 #else
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index f19b93a71ce9..bbcebd6bb869 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cond.c,v 1.9 1999/08/12 13:30:08 hoek Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/config.h b/usr.bin/make/config.h
index 3d44e2e07e12..5732247eb83d 100644
--- a/usr.bin/make/config.h
+++ b/usr.bin/make/config.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)config.h	8.1 (Berkeley) 6/6/93
- *	$Id: config.h,v 1.6 1997/02/22 19:27:08 peter Exp $
+ * $FreeBSD$
  */
 
 #define	DEFSHELL	1			/* Bourne shell */
diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c
index eb059993186b..95e6bfb45fc6 100644
--- a/usr.bin/make/dir.c
+++ b/usr.bin/make/dir.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: dir.c,v 1.7 1997/02/22 19:27:08 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/dir.h b/usr.bin/make/dir.h
index 62687c5e57e3..487957222eee 100644
--- a/usr.bin/make/dir.h
+++ b/usr.bin/make/dir.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)dir.h	8.1 (Berkeley) 6/6/93
- *	$Id$
+ * $FreeBSD$
  */
 
 /* dir.h --
diff --git a/usr.bin/make/for.c b/usr.bin/make/for.c
index 983b9fdba898..0d907cafaa46 100644
--- a/usr.bin/make/for.c
+++ b/usr.bin/make/for.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: for.c,v 1.7 1997/02/22 19:27:09 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/hash.c b/usr.bin/make/hash.c
index 12dfbd9cd415..021980053ea3 100644
--- a/usr.bin/make/hash.c
+++ b/usr.bin/make/hash.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: hash.c,v 1.6 1997/02/22 19:27:10 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/hash.h b/usr.bin/make/hash.h
index 6e88ed8f44d9..6a1dcbd12f44 100644
--- a/usr.bin/make/hash.h
+++ b/usr.bin/make/hash.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)hash.h	8.1 (Berkeley) 6/6/93
- *	$Id$
+ * $FreeBSD$
  */
 
 /* hash.h --
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index 0dbc3adc2a03..7fac04e3ba17 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: job.c,v 1.13 1999/08/17 00:39:19 hoek Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/job.h b/usr.bin/make/job.h
index 6dac5e497071..87aef22057e6 100644
--- a/usr.bin/make/job.h
+++ b/usr.bin/make/job.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)job.h	8.1 (Berkeley) 6/6/93
- *	$Id: job.h,v 1.8 1997/04/21 20:32:11 phk Exp $
+ * $FreeBSD$
  */
 
 /*-
diff --git a/usr.bin/make/list.h b/usr.bin/make/list.h
index fef964250586..e053f1a6d6f0 100644
--- a/usr.bin/make/list.h
+++ b/usr.bin/make/list.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)list.h	8.1 (Berkeley) 6/6/93
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/usr.bin/make/lst.h b/usr.bin/make/lst.h
index 3cb3ee1909bb..e297ff09d46a 100644
--- a/usr.bin/make/lst.h
+++ b/usr.bin/make/lst.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)lst.h	8.1 (Berkeley) 6/6/93
- *	$Id: lst.h,v 1.7 1997/02/22 19:27:13 peter Exp $
+ * $FreeBSD$
  */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstAppend.c b/usr.bin/make/lst.lib/lstAppend.c
index e936f730826b..a6d3a7bbd143 100644
--- a/usr.bin/make/lst.lib/lstAppend.c
+++ b/usr.bin/make/lst.lib/lstAppend.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstAtEnd.c b/usr.bin/make/lst.lib/lstAtEnd.c
index c4f7480963df..9d22bef9ba05 100644
--- a/usr.bin/make/lst.lib/lstAtEnd.c
+++ b/usr.bin/make/lst.lib/lstAtEnd.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstAtFront.c b/usr.bin/make/lst.lib/lstAtFront.c
index 720e6635e17a..57a895062890 100644
--- a/usr.bin/make/lst.lib/lstAtFront.c
+++ b/usr.bin/make/lst.lib/lstAtFront.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstClose.c b/usr.bin/make/lst.lib/lstClose.c
index f28119f056d1..d0a8e9f6600a 100644
--- a/usr.bin/make/lst.lib/lstClose.c
+++ b/usr.bin/make/lst.lib/lstClose.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstConcat.c b/usr.bin/make/lst.lib/lstConcat.c
index 5cb8a67f63bb..fd98a308bf86 100644
--- a/usr.bin/make/lst.lib/lstConcat.c
+++ b/usr.bin/make/lst.lib/lstConcat.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstDatum.c b/usr.bin/make/lst.lib/lstDatum.c
index ec7d11c91e68..afb84b46fec6 100644
--- a/usr.bin/make/lst.lib/lstDatum.c
+++ b/usr.bin/make/lst.lib/lstDatum.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstDeQueue.c b/usr.bin/make/lst.lib/lstDeQueue.c
index 62335022c838..a10becbc0be9 100644
--- a/usr.bin/make/lst.lib/lstDeQueue.c
+++ b/usr.bin/make/lst.lib/lstDeQueue.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstDestroy.c b/usr.bin/make/lst.lib/lstDestroy.c
index e2414522ac61..2a84d638c0c0 100644
--- a/usr.bin/make/lst.lib/lstDestroy.c
+++ b/usr.bin/make/lst.lib/lstDestroy.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstDupl.c b/usr.bin/make/lst.lib/lstDupl.c
index cc5e75e1ebb1..a29fa2febecc 100644
--- a/usr.bin/make/lst.lib/lstDupl.c
+++ b/usr.bin/make/lst.lib/lstDupl.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstEnQueue.c b/usr.bin/make/lst.lib/lstEnQueue.c
index d7627f33b3e5..cafc4a699473 100644
--- a/usr.bin/make/lst.lib/lstEnQueue.c
+++ b/usr.bin/make/lst.lib/lstEnQueue.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstFind.c b/usr.bin/make/lst.lib/lstFind.c
index fbbae6689410..a74d6b9b6bf2 100644
--- a/usr.bin/make/lst.lib/lstFind.c
+++ b/usr.bin/make/lst.lib/lstFind.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstFindFrom.c b/usr.bin/make/lst.lib/lstFindFrom.c
index 6c64cf1483fe..96ce3b079cf4 100644
--- a/usr.bin/make/lst.lib/lstFindFrom.c
+++ b/usr.bin/make/lst.lib/lstFindFrom.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstFirst.c b/usr.bin/make/lst.lib/lstFirst.c
index e7a30397d555..b9f2ae55286a 100644
--- a/usr.bin/make/lst.lib/lstFirst.c
+++ b/usr.bin/make/lst.lib/lstFirst.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstForEach.c b/usr.bin/make/lst.lib/lstForEach.c
index 1688e9d36d7c..95ee44abbc27 100644
--- a/usr.bin/make/lst.lib/lstForEach.c
+++ b/usr.bin/make/lst.lib/lstForEach.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstForEachFrom.c b/usr.bin/make/lst.lib/lstForEachFrom.c
index 7692c57e7806..aff154f70e0c 100644
--- a/usr.bin/make/lst.lib/lstForEachFrom.c
+++ b/usr.bin/make/lst.lib/lstForEachFrom.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstInit.c b/usr.bin/make/lst.lib/lstInit.c
index a16fca27c458..7b3c2b089312 100644
--- a/usr.bin/make/lst.lib/lstInit.c
+++ b/usr.bin/make/lst.lib/lstInit.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstInsert.c b/usr.bin/make/lst.lib/lstInsert.c
index 8c4ebcb30b04..3c3861e11803 100644
--- a/usr.bin/make/lst.lib/lstInsert.c
+++ b/usr.bin/make/lst.lib/lstInsert.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstInt.h b/usr.bin/make/lst.lib/lstInt.h
index dd38bf0eaa69..0e287405ab39 100644
--- a/usr.bin/make/lst.lib/lstInt.h
+++ b/usr.bin/make/lst.lib/lstInt.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)lstInt.h	8.1 (Berkeley) 6/6/93
- *	$Id: lstInt.h,v 1.5 1997/02/22 19:27:40 peter Exp $
+ * $FreeBSD$
  */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstIsAtEnd.c b/usr.bin/make/lst.lib/lstIsAtEnd.c
index 2c480197c1e0..50a4de019319 100644
--- a/usr.bin/make/lst.lib/lstIsAtEnd.c
+++ b/usr.bin/make/lst.lib/lstIsAtEnd.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstIsEmpty.c b/usr.bin/make/lst.lib/lstIsEmpty.c
index 6a9a7bdb5a29..79a27431e4dd 100644
--- a/usr.bin/make/lst.lib/lstIsEmpty.c
+++ b/usr.bin/make/lst.lib/lstIsEmpty.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstLast.c b/usr.bin/make/lst.lib/lstLast.c
index 49b2f8e39adc..1affe2e0c383 100644
--- a/usr.bin/make/lst.lib/lstLast.c
+++ b/usr.bin/make/lst.lib/lstLast.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstMember.c b/usr.bin/make/lst.lib/lstMember.c
index cc5cb4f416d4..7e3c2ceb9f72 100644
--- a/usr.bin/make/lst.lib/lstMember.c
+++ b/usr.bin/make/lst.lib/lstMember.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstNext.c b/usr.bin/make/lst.lib/lstNext.c
index f6e2656e89ef..6008d0a485b5 100644
--- a/usr.bin/make/lst.lib/lstNext.c
+++ b/usr.bin/make/lst.lib/lstNext.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstOpen.c b/usr.bin/make/lst.lib/lstOpen.c
index fbb7d0e7b298..9af9c7cd163d 100644
--- a/usr.bin/make/lst.lib/lstOpen.c
+++ b/usr.bin/make/lst.lib/lstOpen.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstRemove.c b/usr.bin/make/lst.lib/lstRemove.c
index e84d301ec626..be8b375e4b7d 100644
--- a/usr.bin/make/lst.lib/lstRemove.c
+++ b/usr.bin/make/lst.lib/lstRemove.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstReplace.c b/usr.bin/make/lst.lib/lstReplace.c
index a2dcb459da2d..967da863f6a4 100644
--- a/usr.bin/make/lst.lib/lstReplace.c
+++ b/usr.bin/make/lst.lib/lstReplace.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstSucc.c b/usr.bin/make/lst.lib/lstSucc.c
index b43a00cb4dc0..6412f3e52d8a 100644
--- a/usr.bin/make/lst.lib/lstSucc.c
+++ b/usr.bin/make/lst.lib/lstSucc.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index 3aecd8332fe4..25726b871a5f 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -47,7 +47,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 3/19/94";
 #else
 static const char rcsid[] =
-	"$Id: main.c,v 1.32 1999/07/31 20:53:01 hoek Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index ff3e61786354..642e7e78ccf8 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
-.\"	$Id: make.1,v 1.22 1999/08/14 06:47:13 chris Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 19, 1994
 .Dt MAKE 1
diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c
index 509215c2746e..6c53c052caac 100644
--- a/usr.bin/make/make.c
+++ b/usr.bin/make/make.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: make.c,v 1.8 1997/02/22 19:27:16 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -43,7 +43,7 @@
 static char sccsid[] = "@(#)make.c	8.1 (Berkeley) 6/6/93";
 #else
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h
index 3845e7dafa0a..24106519eb30 100644
--- a/usr.bin/make/make.h
+++ b/usr.bin/make/make.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)make.h	8.3 (Berkeley) 6/13/95
- *	$Id: make.h,v 1.9 1999/07/31 20:53:02 hoek Exp $
+ * $FreeBSD$
  */
 
 /*-
diff --git a/usr.bin/make/nonints.h b/usr.bin/make/nonints.h
index 4b8b21152b0e..ce1665d96c85 100644
--- a/usr.bin/make/nonints.h
+++ b/usr.bin/make/nonints.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)nonints.h	8.3 (Berkeley) 3/19/94
- *	$Id: nonints.h,v 1.6 1997/02/22 19:27:17 peter Exp $
+ * $FreeBSD$
  */
 
 /* arch.c */
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index 5b2ceb79781d..e7e5daf9debc 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -41,7 +41,7 @@
 static char sccsid[] = "@(#)parse.c	8.3 (Berkeley) 3/19/94";
 #else
 static const char rcsid[] =
-	"$Id: parse.c,v 1.20 1999/01/08 18:37:34 jkh Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/pathnames.h b/usr.bin/make/pathnames.h
index d456c357ff2d..1f15c082ead7 100644
--- a/usr.bin/make/pathnames.h
+++ b/usr.bin/make/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pathnames.h	5.2 (Berkeley) 6/1/90
- *	$Id: pathnames.h,v 1.7 1997/02/22 19:27:20 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _PATH_OBJDIR
diff --git a/usr.bin/make/sprite.h b/usr.bin/make/sprite.h
index ca55509e22e6..ee20057f43bb 100644
--- a/usr.bin/make/sprite.h
+++ b/usr.bin/make/sprite.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sprite.h	8.1 (Berkeley) 6/6/93
- *	$Id: sprite.h,v 1.7 1997/02/22 19:27:21 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/usr.bin/make/str.c b/usr.bin/make/str.c
index 7d17dd621ea4..524d9001aa95 100644
--- a/usr.bin/make/str.c
+++ b/usr.bin/make/str.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: str.c,v 1.9 1997/02/22 19:27:23 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -43,7 +43,7 @@
 static char sccsid[] = "@(#)str.c	5.8 (Berkeley) 6/1/90";
 #else
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c
index 898cc9e1bdf8..0bec455ead4e 100644
--- a/usr.bin/make/suff.c
+++ b/usr.bin/make/suff.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: suff.c,v 1.9 1998/04/26 09:44:48 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/targ.c b/usr.bin/make/targ.c
index 21aaa64dbe31..04ab41889195 100644
--- a/usr.bin/make/targ.c
+++ b/usr.bin/make/targ.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: targ.c,v 1.7 1997/02/22 19:27:24 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/util.c b/usr.bin/make/util.c
index 62b0e79dab60..174954eb445a 100644
--- a/usr.bin/make/util.c
+++ b/usr.bin/make/util.c
@@ -3,7 +3,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include <stdio.h>
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index 2f29567b4e50..f9ae2b126d06 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: var.c,v 1.13 1999/07/31 20:53:02 hoek Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/mesg/mesg.1 b/usr.bin/mesg/mesg.1
index 2dce0b1651f9..7bdf0fd17246 100644
--- a/usr.bin/mesg/mesg.1
+++ b/usr.bin/mesg/mesg.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mesg.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: mesg.1,v 1.5 1997/03/29 20:01:59 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt MESG 1
diff --git a/usr.bin/mesg/mesg.c b/usr.bin/mesg/mesg.c
index 5faffa4a7ef2..4e5878b2a1ae 100644
--- a/usr.bin/mesg/mesg.c
+++ b/usr.bin/mesg/mesg.c
@@ -47,7 +47,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mesg.c	8.2 (Berkeley) 1/21/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/minigzip/Makefile b/usr.bin/minigzip/Makefile
index 4d7fff388e33..edc5d85e81c7 100644
--- a/usr.bin/minigzip/Makefile
+++ b/usr.bin/minigzip/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.1 1997/12/13 09:57:48 msmith Exp $
+# $FreeBSD$
 
 PROG=	minigzip
 LDADD+=	-lz
diff --git a/usr.bin/minigzip/minigzip.1 b/usr.bin/minigzip/minigzip.1
index 7ace82cbf4e5..48a60ea11324 100644
--- a/usr.bin/minigzip/minigzip.1
+++ b/usr.bin/minigzip/minigzip.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: minigzip.1,v 1.1.1.1 1997/12/13 09:57:48 msmith Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 13, 1997
 .Dt MINIGZIP 1
diff --git a/usr.bin/mk_cmds/Makefile b/usr.bin/mk_cmds/Makefile
index 8cc838403d60..5286e0126add 100644
--- a/usr.bin/mk_cmds/Makefile
+++ b/usr.bin/mk_cmds/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.6 1998/05/04 20:09:03 bde Exp $
+# $FreeBSD$
 
 PROG=	mk_cmds
 SRCS=	mk_cmds.c options.c utils.c ct.y cmd_tbl.l y.tab.h
diff --git a/usr.bin/mkdep/mkdep.1 b/usr.bin/mkdep/mkdep.1
index f19fbc87c61a..9165a0e2a6f4 100644
--- a/usr.bin/mkdep/mkdep.1
+++ b/usr.bin/mkdep/mkdep.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkdep.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt MKDEP 1
diff --git a/usr.bin/mkdep/mkdep.gcc.sh b/usr.bin/mkdep/mkdep.gcc.sh
index ff4e2f360131..ec00dcfbdf92 100644
--- a/usr.bin/mkdep/mkdep.gcc.sh
+++ b/usr.bin/mkdep/mkdep.gcc.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)mkdep.gcc.sh	8.1 (Berkeley) 6/6/93
-#	$Id: mkdep.gcc.sh,v 1.14 1998/08/24 10:16:39 cracauer Exp $
+# $FreeBSD$
 
 D=.depend			# default dependency file is .depend
 append=0
diff --git a/usr.bin/mkfifo/mkfifo.1 b/usr.bin/mkfifo/mkfifo.1
index 44fe0044cb1c..a7443c57664f 100644
--- a/usr.bin/mkfifo/mkfifo.1
+++ b/usr.bin/mkfifo/mkfifo.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkfifo.1	8.2 (Berkeley) 1/5/94
-.\"	$Id: mkfifo.1,v 1.4 1997/04/27 08:45:45 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 5, 1994
 .Dt MKFIFO 1
diff --git a/usr.bin/mkfifo/mkfifo.c b/usr.bin/mkfifo/mkfifo.c
index 270951a5d0d7..7f97a13566ba 100644
--- a/usr.bin/mkfifo/mkfifo.c
+++ b/usr.bin/mkfifo/mkfifo.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mkfifo.c	8.2 (Berkeley) 1/5/94";
 #endif
 static const char rcsid[] =
-	"$Id: mkfifo.c,v 1.3 1997/07/24 07:02:55 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/mklocale/Makefile b/usr.bin/mklocale/Makefile
index 41933a9c1a5d..955c8c2fe961 100644
--- a/usr.bin/mklocale/Makefile
+++ b/usr.bin/mklocale/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/7/93
-#	$Id: Makefile,v 1.18 1998/05/04 20:09:03 bde Exp $
+# $FreeBSD$
 
 PROG=	mklocale
 SRCS=	yacc.y lex.l y.tab.h
diff --git a/usr.bin/mklocale/data/Makefile b/usr.bin/mklocale/data/Makefile
index 2ef612c9f74d..1c446a9ca13b 100644
--- a/usr.bin/mklocale/data/Makefile
+++ b/usr.bin/mklocale/data/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.18 1999/06/05 03:04:00 julian Exp $
+# $FreeBSD$
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
diff --git a/usr.bin/mklocale/data/lt_LN.ISO_8859-2.src b/usr.bin/mklocale/data/lt_LN.ISO_8859-2.src
index 3f9ad913e06a..a9fa03fc89e5 100644
--- a/usr.bin/mklocale/data/lt_LN.ISO_8859-2.src
+++ b/usr.bin/mklocale/data/lt_LN.ISO_8859-2.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for the iso_8859_2 Locale
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 ENCODING	"NONE"
diff --git a/usr.bin/mklocale/data/zh_CN.EUC.src b/usr.bin/mklocale/data/zh_CN.EUC.src
index 1680f3cc1998..b298ef5de562 100644
--- a/usr.bin/mklocale/data/zh_CN.EUC.src
+++ b/usr.bin/mklocale/data/zh_CN.EUC.src
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: zh_CN.EUC.src,v 1.1 1998/08/10 09:49:42 phk Exp $
+ * $FreeBSD$
  */
 
 ENCODING	"EUC"
diff --git a/usr.bin/mklocale/mklocale.1 b/usr.bin/mklocale/mklocale.1
index 842b434db494..34ec49f24ab5 100644
--- a/usr.bin/mklocale/mklocale.1
+++ b/usr.bin/mklocale/mklocale.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mklocale.1	8.2 (Berkeley) 4/18/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt MKLOCALE 1
diff --git a/usr.bin/mkstr/mkstr.1 b/usr.bin/mkstr/mkstr.1
index 00d981389a2e..9486c8c4bf73 100644
--- a/usr.bin/mkstr/mkstr.1
+++ b/usr.bin/mkstr/mkstr.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkstr.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt MKSTR 1
diff --git a/usr.bin/mkstr/mkstr.c b/usr.bin/mkstr/mkstr.c
index 588af2c20760..a0db88949595 100644
--- a/usr.bin/mkstr/mkstr.c
+++ b/usr.bin/mkstr/mkstr.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mkstr.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: mkstr.c,v 1.2 1997/07/24 07:05:02 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/mktemp/mktemp.1 b/usr.bin/mktemp/mktemp.1
index 25e8b4ff731f..1e5eff0c3758 100644
--- a/usr.bin/mktemp/mktemp.1
+++ b/usr.bin/mktemp/mktemp.1
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd November, 20, 1996
 .Dt MKTEMP 1
diff --git a/usr.bin/more/Makefile b/usr.bin/more/Makefile
index e63efcf6009e..79048432118c 100644
--- a/usr.bin/more/Makefile
+++ b/usr.bin/more/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	more
 CFLAGS+=-I${.CURDIR} -DTERMIOS
diff --git a/usr.bin/more/command.c b/usr.bin/more/command.c
index ba6430ad99db..0a400d881bc6 100644
--- a/usr.bin/more/command.c
+++ b/usr.bin/more/command.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)command.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-        "$Id: command.c,v 1.12 1999/06/01 20:02:31 hoek Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/more/decode.c b/usr.bin/more/decode.c
index 2d490fae5605..4a3315275946 100644
--- a/usr.bin/more/decode.c
+++ b/usr.bin/more/decode.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)decode.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-        "$Id: decode.c,v 1.2 1999/05/30 18:06:53 hoek Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/input.c b/usr.bin/more/input.c
index b22c3d9fd2a3..50e2031724ab 100644
--- a/usr.bin/more/input.c
+++ b/usr.bin/more/input.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)input.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-        "$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/less.h b/usr.bin/more/less.h
index deb7ec50620d..e17ec4038210 100644
--- a/usr.bin/more/less.h
+++ b/usr.bin/more/less.h
@@ -33,7 +33,7 @@
  *
  *	@(#)less.h	8.1 (Berkeley) 6/6/93
  *
- *	$Id: less.h,v 1.3 1999/05/30 18:06:55 hoek Exp $
+ * $FreeBSD$
  */
 
 #define	NULL_POSITION	((off_t)(-1))
diff --git a/usr.bin/more/line.c b/usr.bin/more/line.c
index 88178bb76a2b..6b980739b1dc 100644
--- a/usr.bin/more/line.c
+++ b/usr.bin/more/line.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)line.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-        "$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/main.c b/usr.bin/more/main.c
index 52e81bf10391..f7159eaafbb8 100644
--- a/usr.bin/more/main.c
+++ b/usr.bin/more/main.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/7/93";
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: main.c,v 1.11 1999/05/30 18:06:56 hoek Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/more.1 b/usr.bin/more/more.1
index c31a7c1f43c8..09bd03066c89 100644
--- a/usr.bin/more/more.1
+++ b/usr.bin/more/more.1
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)more.1	8.2 (Berkeley) 4/18/94
-.\"	$Id: more.1,v 1.11 1999/07/12 20:23:47 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt MORE 1
diff --git a/usr.bin/more/option.c b/usr.bin/more/option.c
index 79fd849e2a36..53f332b9e6ce 100644
--- a/usr.bin/more/option.c
+++ b/usr.bin/more/option.c
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)option.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: option.c,v 1.4 1998/07/25 05:56:49 hoek Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.bin/more/output.c b/usr.bin/more/output.c
index 862dbc22a4b5..337a294e6b9a 100644
--- a/usr.bin/more/output.c
+++ b/usr.bin/more/output.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)output.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-        "$Id: output.c,v 1.9 1999/05/30 18:06:56 hoek Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/prim.c b/usr.bin/more/prim.c
index bb815672e51f..03fcad8d408e 100644
--- a/usr.bin/more/prim.c
+++ b/usr.bin/more/prim.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)prim.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-        "$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/tags.c b/usr.bin/more/tags.c
index c48c99fc3891..1014d48494b7 100644
--- a/usr.bin/more/tags.c
+++ b/usr.bin/more/tags.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)tags.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-        "$Id: tags.c,v 1.5 1999/06/04 19:35:22 hoek Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/msgs/Makefile b/usr.bin/msgs/Makefile
index 8613f79cb5ea..21cb15155568 100644
--- a/usr.bin/msgs/Makefile
+++ b/usr.bin/msgs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	msgs
 DPADD=	${LIBTERMCAP}
diff --git a/usr.bin/msgs/msgs.1 b/usr.bin/msgs/msgs.1
index 2efddec4372e..3139f00dc943 100644
--- a/usr.bin/msgs/msgs.1
+++ b/usr.bin/msgs/msgs.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)msgs.1	8.2 (Berkeley) 4/28/95
-.\"	$Id: msgs.1,v 1.6 1999/07/12 20:23:47 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 28, 1995
 .Dt MSGS 1
diff --git a/usr.bin/msgs/msgs.c b/usr.bin/msgs/msgs.c
index ff09c9e07248..17536400f468 100644
--- a/usr.bin/msgs/msgs.c
+++ b/usr.bin/msgs/msgs.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)msgs.c	8.2 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: msgs.c,v 1.13 1998/07/14 19:07:30 ghelmer Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/mt/Makefile b/usr.bin/mt/Makefile
index b09a36b6d372..0e692e92cd12 100644
--- a/usr.bin/mt/Makefile
+++ b/usr.bin/mt/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	mt
 CFLAGS+=-I${.CURDIR}/../../sys
diff --git a/usr.bin/mt/mt.1 b/usr.bin/mt/mt.1
index 9a988057e9c8..5647313b2a14 100644
--- a/usr.bin/mt/mt.1
+++ b/usr.bin/mt/mt.1
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mt.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt MT 1
diff --git a/usr.bin/mt/mt.c b/usr.bin/mt/mt.c
index ff2a2d64b574..9fcb727e197a 100644
--- a/usr.bin/mt/mt.c
+++ b/usr.bin/mt/mt.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mt.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: mt.c,v 1.24 1999/03/10 18:42:20 mjacob Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/ncal/Makefile b/usr.bin/ncal/Makefile
index 7d0212cbd0fe..569453240d60 100644
--- a/usr.bin/ncal/Makefile
+++ b/usr.bin/ncal/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 PROG= ncal
 SRCS= ncal.c
 
diff --git a/usr.bin/ncal/ncal.1 b/usr.bin/ncal/ncal.1
index 635cc926ea33..5636440d0e56 100644
--- a/usr.bin/ncal/ncal.1
+++ b/usr.bin/ncal/ncal.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: ncal.1,v 1.6 1998/03/23 07:45:08 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 16, 1997
 .Dt CAL 1
diff --git a/usr.bin/ncal/ncal.c b/usr.bin/ncal/ncal.c
index 03f48a93b06a..5feac67afa9a 100644
--- a/usr.bin/ncal/ncal.c
+++ b/usr.bin/ncal/ncal.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: ncal.c,v 1.7 1999/03/27 21:08:13 helbig Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <calendar.h>
diff --git a/usr.bin/netstat/atalk.c b/usr.bin/netstat/atalk.c
index 90ed87dbe5cd..f0a72e48eae1 100644
--- a/usr.bin/netstat/atalk.c
+++ b/usr.bin/netstat/atalk.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)atalk.c	1.1 (Whistle) 6/6/96";
 */
 static const char rcsid[] =
-	"$Id: atalk.c,v 1.10 1997/07/29 06:51:39 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index 26191f8b82a8..61ad2b6cd30b 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)if.c	8.3 (Berkeley) 4/28/95";
 */
 static const char rcsid[] =
-	"$Id: if.c,v 1.25 1999/04/20 22:04:31 billf Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c
index 08777aa20e91..826afccce4ee 100644
--- a/usr.bin/netstat/inet.c
+++ b/usr.bin/netstat/inet.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)inet.c	8.5 (Berkeley) 5/24/95";
 */
 static const char rcsid[] =
-	"$Id: inet.c,v 1.31 1999/03/10 17:25:42 des Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/ipx.c b/usr.bin/netstat/ipx.c
index 215cbd0309b0..3495adaadf5d 100644
--- a/usr.bin/netstat/ipx.c
+++ b/usr.bin/netstat/ipx.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)ns.c	8.1 (Berkeley) 6/6/93";
 */
 static const char rcsid[] =
-	"$Id: ipx.c,v 1.9 1997/07/29 06:51:39 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index 0f3072ef3bd9..f3c956387b50 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -42,7 +42,7 @@ char const copyright[] =
 static char sccsid[] = "@(#)main.c	8.4 (Berkeley) 3/1/94";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.25 1999/04/26 16:11:48 luigi Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c
index 76e001fdc827..921b31ac7bee 100644
--- a/usr.bin/netstat/mbuf.c
+++ b/usr.bin/netstat/mbuf.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)mbuf.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: mbuf.c,v 1.14 1998/08/23 15:23:11 gpalmer Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1
index 22b3a5d0619d..6a77a482af28 100644
--- a/usr.bin/netstat/netstat.1
+++ b/usr.bin/netstat/netstat.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)netstat.1	8.8 (Berkeley) 4/18/94
-.\"	$Id: netstat.1,v 1.13 1999/07/12 20:23:49 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt NETSTAT 1
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index 24b5a9b4e1ab..129337bfbcae 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "From: @(#)route.c	8.6 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: route.c,v 1.32 1998/07/06 20:52:08 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/unix.c b/usr.bin/netstat/unix.c
index 195588e2c1aa..345e28a4ee41 100644
--- a/usr.bin/netstat/unix.c
+++ b/usr.bin/netstat/unix.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)unix.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: unix.c,v 1.10 1998/08/08 08:13:04 phk Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/newkey/Makefile b/usr.bin/newkey/Makefile
index e976b9a5bb9f..75f369face5a 100644
--- a/usr.bin/newkey/Makefile
+++ b/usr.bin/newkey/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1.1.1 1997/05/28 15:52:07 wpaul Exp $
+# $FreeBSD$
 
 PROG= newkey
 SRCS= newkey.c update.c generic.c
diff --git a/usr.bin/newkey/generic.c b/usr.bin/newkey/generic.c
index 2c3ec1e8cbe1..4067867d6598 100644
--- a/usr.bin/newkey/generic.c
+++ b/usr.bin/newkey/generic.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)generic.c 1.2 91/03/11 Copyr 1986 Sun Micro";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/usr.bin/newkey/newkey.8 b/usr.bin/newkey/newkey.8
index ad9f990ad07e..d17c9594a69e 100644
--- a/usr.bin/newkey/newkey.8
+++ b/usr.bin/newkey/newkey.8
@@ -1,5 +1,5 @@
 .\" @(#)newkey.8 1.3 91/03/11 TIRPC 1.0; from 1.12 90/02/03 SMI;
-.\" $Id$
+.\" $FreeBSD$
 .Dd October 12, 1987
 .Dt NEWKEY 8
 .Os
diff --git a/usr.bin/newkey/newkey.c b/usr.bin/newkey/newkey.c
index dcf14ecab28e..141614ee088d 100644
--- a/usr.bin/newkey/newkey.c
+++ b/usr.bin/newkey/newkey.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)newkey.c 1.8 91/03/11 Copyr 1986 Sun Micro";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/usr.bin/newkey/update.c b/usr.bin/newkey/update.c
index 609977a593df..2f1c53fab9ae 100644
--- a/usr.bin/newkey/update.c
+++ b/usr.bin/newkey/update.c
@@ -32,7 +32,7 @@
 static	char sccsid[] = "@(#)update.c 1.2 91/03/11 Copyr 1986 Sun Micro";
 #endif
 static const char rcsid[] =
-	"$Id: update.c,v 1.3 1998/02/20 04:38:20 jb Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/usr.bin/nfsstat/nfsstat.1 b/usr.bin/nfsstat/nfsstat.1
index 4d29692de52d..94f36d750187 100644
--- a/usr.bin/nfsstat/nfsstat.1
+++ b/usr.bin/nfsstat/nfsstat.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)nfsstat.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: nfsstat.1,v 1.6 1997/02/22 19:56:24 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt NFSSTAT 1
diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c
index 3ba45c9cc0c0..f68f6216c3e5 100644
--- a/usr.bin/nfsstat/nfsstat.c
+++ b/usr.bin/nfsstat/nfsstat.c
@@ -45,7 +45,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)nfsstat.c	8.2 (Berkeley) 3/31/95";
 #endif
 static const char rcsid[] =
-	"$Id: nfsstat.c,v 1.11 1998/10/24 19:36:52 msmith Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/nice/nice.1 b/usr.bin/nice/nice.1
index 010a3458f493..2531a9ca4aaf 100644
--- a/usr.bin/nice/nice.1
+++ b/usr.bin/nice/nice.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)nice.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: nice.1,v 1.8 1999/06/25 20:54:28 billf Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt NICE 1
diff --git a/usr.bin/nm/nm.1 b/usr.bin/nm/nm.1
index a1f8b3c462fa..d6a52d22b42e 100644
--- a/usr.bin/nm/nm.1
+++ b/usr.bin/nm/nm.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nm.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: nm.1,v 1.7 1997/02/22 19:56:28 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt NM 1
diff --git a/usr.bin/nm/nm.1aout b/usr.bin/nm/nm.1aout
index a1f8b3c462fa..d6a52d22b42e 100644
--- a/usr.bin/nm/nm.1aout
+++ b/usr.bin/nm/nm.1aout
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nm.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: nm.1,v 1.7 1997/02/22 19:56:28 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt NM 1
diff --git a/usr.bin/nm/nm.c b/usr.bin/nm/nm.c
index 1e6cbc5d6de6..91665b229a51 100644
--- a/usr.bin/nm/nm.c
+++ b/usr.bin/nm/nm.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)nm.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: nm.c,v 1.11 1997/07/31 06:53:36 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/nohup/nohup.1 b/usr.bin/nohup/nohup.1
index 780cd7ba823c..1fcc7efd3a21 100644
--- a/usr.bin/nohup/nohup.1
+++ b/usr.bin/nohup/nohup.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)nohup.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt NOHUP 1
diff --git a/usr.bin/nohup/nohup.c b/usr.bin/nohup/nohup.c
index 3455c7cb797e..8992997b6cfd 100644
--- a/usr.bin/nohup/nohup.c
+++ b/usr.bin/nohup/nohup.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)nohup.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: nohup.c,v 1.2 1997/07/31 06:54:45 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/objformat/objformat.1 b/usr.bin/objformat/objformat.1
index 28cb408bb2cd..9fde70c17d69 100644
--- a/usr.bin/objformat/objformat.1
+++ b/usr.bin/objformat/objformat.1
@@ -23,7 +23,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: objformat.1,v 1.1 1998/10/25 13:25:42 obrien Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 25, 1998
 .Os
diff --git a/usr.bin/opieinfo/Makefile b/usr.bin/opieinfo/Makefile
index 1e3f9778feb3..7f7241dc5e72 100644
--- a/usr.bin/opieinfo/Makefile
+++ b/usr.bin/opieinfo/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 
diff --git a/usr.bin/opiekey/Makefile b/usr.bin/opiekey/Makefile
index de04e8daa6e0..6c43636ad57b 100644
--- a/usr.bin/opiekey/Makefile
+++ b/usr.bin/opiekey/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 
diff --git a/usr.bin/opiepasswd/Makefile b/usr.bin/opiepasswd/Makefile
index bb52c8229bcd..7fc70ffbf5e7 100644
--- a/usr.bin/opiepasswd/Makefile
+++ b/usr.bin/opiepasswd/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 
diff --git a/usr.bin/pagesize/pagesize.1 b/usr.bin/pagesize/pagesize.1
index d89cd9a33d8e..aac371d04db0 100644
--- a/usr.bin/pagesize/pagesize.1
+++ b/usr.bin/pagesize/pagesize.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pagesize.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt PAGESIZE 1
diff --git a/usr.bin/pagesize/pagesize.sh b/usr.bin/pagesize/pagesize.sh
index 4c7aeea75e08..fd5477b3222b 100644
--- a/usr.bin/pagesize/pagesize.sh
+++ b/usr.bin/pagesize/pagesize.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)pagesize.sh	8.1 (Berkeley) 4/3/94
-#	$Id$
+# $FreeBSD$
 #
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index d376bff0a3e7..9ac3f0dab724 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,5 +1,5 @@
 # From:	@(#)Makefile	8.3 (Berkeley) 4/2/94
-# $Id: Makefile,v 1.31 1999/02/14 13:56:15 des Exp $
+# $FreeBSD$
 
 PROG=	passwd
 SRCS=	local_passwd.c passwd.c pw_copy.c pw_util.c pw_yp.c \
diff --git a/usr.bin/passwd/extern.h b/usr.bin/passwd/extern.h
index 7a4bd127c98d..287646c6a380 100644
--- a/usr.bin/passwd/extern.h
+++ b/usr.bin/passwd/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)extern.h	8.1 (Berkeley) 4/2/94
- *	$Id$
+ * $FreeBSD$
  */
 
 int	krb_passwd __P((char *, char *, char *, char *));
diff --git a/usr.bin/passwd/local_passwd.c b/usr.bin/passwd/local_passwd.c
index 339d5e31be09..07e1d183d440 100644
--- a/usr.bin/passwd/local_passwd.c
+++ b/usr.bin/passwd/local_passwd.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/passwd/passwd.1 b/usr.bin/passwd/passwd.1
index 140c203d16e4..8019c759b8d9 100644
--- a/usr.bin/passwd/passwd.1
+++ b/usr.bin/passwd/passwd.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)passwd.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: passwd.1,v 1.14 1999/04/30 18:19:42 hoek Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt PASSWD 1
diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c
index 19a18309ace9..e69864a0dedb 100644
--- a/usr.bin/passwd/passwd.c
+++ b/usr.bin/passwd/passwd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)passwd.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: passwd.c,v 1.14 1998/03/23 14:14:24 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/paste/paste.1 b/usr.bin/paste/paste.1
index 7b97915e509e..77253ffafbbd 100644
--- a/usr.bin/paste/paste.1
+++ b/usr.bin/paste/paste.1
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)paste.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt PASTE 1
diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c
index 7e14a56b7799..a1971199b49c 100644
--- a/usr.bin/paste/paste.c
+++ b/usr.bin/paste/paste.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)paste.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: paste.c,v 1.4 1997/08/05 03:40:04 asami Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/pr/pr.1 b/usr.bin/pr/pr.1
index 74d6d7c8f454..d6afef327138 100644
--- a/usr.bin/pr/pr.1
+++ b/usr.bin/pr/pr.1
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pr.1	8.3 (Berkeley) 4/18/94
-.\"	$Id: pr.1,v 1.4 1997/02/22 19:56:37 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt PR 1
diff --git a/usr.bin/printenv/printenv.1 b/usr.bin/printenv/printenv.1
index d3f8a145d4e0..18f76ee93e89 100644
--- a/usr.bin/printenv/printenv.1
+++ b/usr.bin/printenv/printenv.1
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)printenv.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: printenv.1,v 1.3 1999/07/12 20:23:52 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt PRINTENV 1
diff --git a/usr.bin/printf/printf.1 b/usr.bin/printf/printf.1
index e84aa2de1bf9..665d28fe3dd8 100644
--- a/usr.bin/printf/printf.1
+++ b/usr.bin/printf/printf.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)printf.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt PRINTF 1
diff --git a/usr.bin/quota/quota.1 b/usr.bin/quota/quota.1
index c9bdb10412ad..7d1a471e98bd 100644
--- a/usr.bin/quota/quota.1
+++ b/usr.bin/quota/quota.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)quota.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: quota.1,v 1.5 1997/02/22 19:56:38 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt QUOTA 1
diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c
index c9a15eebb473..246922df88b5 100644
--- a/usr.bin/quota/quota.c
+++ b/usr.bin/quota/quota.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "from: @(#)quota.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: quota.c,v 1.9 1998/06/09 04:30:54 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/ranlib/Makefile b/usr.bin/ranlib/Makefile
index 60ba526cff88..8148e57c2bac 100644
--- a/usr.bin/ranlib/Makefile
+++ b/usr.bin/ranlib/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	ranlib
 SRCS=	archive.c build.c misc.c ranlib.c touch.c
diff --git a/usr.bin/ranlib/build.c b/usr.bin/ranlib/build.c
index eedb7215d08d..b4d8bc69a8ee 100644
--- a/usr.bin/ranlib/build.c
+++ b/usr.bin/ranlib/build.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)build.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/ranlib/misc.c b/usr.bin/ranlib/misc.c
index 97e970de1140..19b4854cbfa7 100644
--- a/usr.bin/ranlib/misc.c
+++ b/usr.bin/ranlib/misc.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ranlib/ranlib.1 b/usr.bin/ranlib/ranlib.1
index 2d37924b7668..d57cf9836a42 100644
--- a/usr.bin/ranlib/ranlib.1
+++ b/usr.bin/ranlib/ranlib.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ranlib.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: ranlib.1,v 1.5 1997/02/22 19:56:39 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt RANLIB 1
diff --git a/usr.bin/ranlib/ranlib.1aout b/usr.bin/ranlib/ranlib.1aout
index 2d37924b7668..d57cf9836a42 100644
--- a/usr.bin/ranlib/ranlib.1aout
+++ b/usr.bin/ranlib/ranlib.1aout
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ranlib.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: ranlib.1,v 1.5 1997/02/22 19:56:39 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt RANLIB 1
diff --git a/usr.bin/ranlib/ranlib.5 b/usr.bin/ranlib/ranlib.5
index 8f7ec14d122e..668ef88c30da 100644
--- a/usr.bin/ranlib/ranlib.5
+++ b/usr.bin/ranlib/ranlib.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ranlib.5.5	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt RANLIB 5
diff --git a/usr.bin/ranlib/ranlib.c b/usr.bin/ranlib/ranlib.c
index 0b60eb1c68cc..40263318e6a6 100644
--- a/usr.bin/ranlib/ranlib.c
+++ b/usr.bin/ranlib/ranlib.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ranlib.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/ranlib/touch.c b/usr.bin/ranlib/touch.c
index bfb10f727616..b062e087c4fe 100644
--- a/usr.bin/ranlib/touch.c
+++ b/usr.bin/ranlib/touch.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)touch.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: touch.c,v 1.4 1997/08/04 06:48:25 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/rdist/Makefile b/usr.bin/rdist/Makefile
index 9aae11958470..ea47411d40a7 100644
--- a/usr.bin/rdist/Makefile
+++ b/usr.bin/rdist/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.3 (Berkeley) 7/19/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	rdist
 SRCS=	docmd.c expand.c gram.y lookup.c main.c rshrcmd.c server.c
diff --git a/usr.bin/rdist/docmd.c b/usr.bin/rdist/docmd.c
index 2da37c6efd01..7ea9a8c1103a 100644
--- a/usr.bin/rdist/docmd.c
+++ b/usr.bin/rdist/docmd.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "From: @(#)docmd.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/rdist/expand.c b/usr.bin/rdist/expand.c
index 83178d00aec2..d5f7ed4fd8a5 100644
--- a/usr.bin/rdist/expand.c
+++ b/usr.bin/rdist/expand.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)expand.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id: expand.c,v 1.6 1998/04/06 06:18:20 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/rdist/gram.y b/usr.bin/rdist/gram.y
index 4040f948a207..bd77901726d6 100644
--- a/usr.bin/rdist/gram.y
+++ b/usr.bin/rdist/gram.y
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)gram.y	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/rdist/lookup.c b/usr.bin/rdist/lookup.c
index acf4bae4fc54..b97ce3f5bf71 100644
--- a/usr.bin/rdist/lookup.c
+++ b/usr.bin/rdist/lookup.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)lookup.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id: lookup.c,v 1.4 1998/04/06 06:18:25 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/rdist/main.c b/usr.bin/rdist/main.c
index c6ab940e9b8b..d4d94a2219b6 100644
--- a/usr.bin/rdist/main.c
+++ b/usr.bin/rdist/main.c
@@ -39,7 +39,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.3 1997/08/05 06:41:26 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/rdist/rdist.1 b/usr.bin/rdist/rdist.1
index b66b5aca2545..9e265b00130f 100644
--- a/usr.bin/rdist/rdist.1
+++ b/usr.bin/rdist/rdist.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rdist.1	8.3 (Berkeley) 3/17/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd March 17, 1994
 .Dt RDIST 1
diff --git a/usr.bin/rdist/rshrcmd.c b/usr.bin/rdist/rshrcmd.c
index 306ef05fe6f8..c747cc6cf5ea 100644
--- a/usr.bin/rdist/rshrcmd.c
+++ b/usr.bin/rdist/rshrcmd.c
@@ -6,7 +6,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include	"defs.h"
diff --git a/usr.bin/rdist/server.c b/usr.bin/rdist/server.c
index d91d723084b5..44c2610fa114 100644
--- a/usr.bin/rdist/server.c
+++ b/usr.bin/rdist/server.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)server.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id: server.c,v 1.8 1998/04/20 06:20:24 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/wait.h>
diff --git a/usr.bin/renice/renice.8 b/usr.bin/renice/renice.8
index 1e99fceeb5ab..09ddf5bb9fbd 100644
--- a/usr.bin/renice/renice.8
+++ b/usr.bin/renice/renice.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)renice.8	8.1 (Berkeley) 6/9/93
-.\"     $Id: renice.8,v 1.3 1999/07/12 20:23:54 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt RENICE 8
diff --git a/usr.bin/renice/renice.c b/usr.bin/renice/renice.c
index 5962ed1707e3..baed30a8b582 100644
--- a/usr.bin/renice/renice.c
+++ b/usr.bin/renice/renice.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)renice.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/rev/rev.1 b/usr.bin/rev/rev.1
index f112ac5976f1..5f15501512b3 100644
--- a/usr.bin/rev/rev.1
+++ b/usr.bin/rev/rev.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rev.1	8.1 (Berkeley) 6/9/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt REV 1
diff --git a/usr.bin/rlogin/Makefile b/usr.bin/rlogin/Makefile
index e5ca71f07b80..2f2fef112f4c 100644
--- a/usr.bin/rlogin/Makefile
+++ b/usr.bin/rlogin/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-#	$Id: Makefile,v 1.12 1998/09/19 22:42:05 obrien Exp $
+# $FreeBSD$
 
 PROG=	rlogin
 SRCS=	rlogin.c
diff --git a/usr.bin/rlogin/rlogin.1 b/usr.bin/rlogin/rlogin.1
index e24234bdaab9..d95e642394cc 100644
--- a/usr.bin/rlogin/rlogin.1
+++ b/usr.bin/rlogin/rlogin.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rlogin.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt RLOGIN 1
diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c
index fd8793b41263..0df97a34bcf0 100644
--- a/usr.bin/rlogin/rlogin.c
+++ b/usr.bin/rlogin/rlogin.c
@@ -40,7 +40,7 @@ static const char copyright[] =
 #ifndef lint
 static const char sccsid[] = "@(#)rlogin.c	8.1 (Berkeley) 6/6/93";
 static const char rcsid[] =
-	"$Id: rlogin.c,v 1.19 1999/05/25 11:14:33 peter Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c
index 4fc6684325c2..cf783040f807 100644
--- a/usr.bin/rpcgen/rpc_cout.c
+++ b/usr.bin/rpcgen/rpc_cout.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI";
 #endif
 static const char rcsid[] =
-	"$Id: rpc_cout.c,v 1.5 1997/08/06 06:47:39 charnier Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c
index b6d7b2c81699..9224dbbc9832 100644
--- a/usr.bin/rpcgen/rpc_main.c
+++ b/usr.bin/rpcgen/rpc_main.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI";
 #endif
 static const char rcsid[] =
-	"$Id: rpc_main.c,v 1.9 1998/03/07 05:43:59 jb Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/usr.bin/rpcgen/rpc_tblout.c b/usr.bin/rpcgen/rpc_tblout.c
index 00b5561e7681..45282c87418c 100644
--- a/usr.bin/rpcgen/rpc_tblout.c
+++ b/usr.bin/rpcgen/rpc_tblout.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)rpc_tblout.c 1.4 89/02/22 (C) 1988 SMI";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/usr.bin/rpcgen/rpc_util.c b/usr.bin/rpcgen/rpc_util.c
index 175cf29fb3f3..75583a586596 100644
--- a/usr.bin/rpcgen/rpc_util.c
+++ b/usr.bin/rpcgen/rpc_util.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)rpc_util.c 1.11 89/02/22 (C) 1987 SMI";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/usr.bin/rpcgen/rpcgen.1 b/usr.bin/rpcgen/rpcgen.1
index a4e1150d7355..7c9abed8f8b2 100644
--- a/usr.bin/rpcgen/rpcgen.1
+++ b/usr.bin/rpcgen/rpcgen.1
@@ -1,5 +1,5 @@
 .\" @(#)rpcgen.1 1.35 93/06/02 SMI
-.\" $Id$
+.\" $FreeBSD$
 .\" Copyright 1985-1993 Sun Microsystems, Inc.
 .Dd March 28, 1993
 .Dt RPCGEN 1
diff --git a/usr.bin/rpcinfo/Makefile b/usr.bin/rpcinfo/Makefile
index f9377c6dbd1b..045c37cf1188 100644
--- a/usr.bin/rpcinfo/Makefile
+++ b/usr.bin/rpcinfo/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.2 (Berkeley) 5/11/90
-#	$Id$
+# $FreeBSD$
 
 PROG=	rpcinfo
 MAN8 = rpcinfo.8
diff --git a/usr.bin/rpcinfo/rpcinfo.8 b/usr.bin/rpcinfo/rpcinfo.8
index 1b6a1bb6dbff..e3fb914fcd09 100644
--- a/usr.bin/rpcinfo/rpcinfo.8
+++ b/usr.bin/rpcinfo/rpcinfo.8
@@ -1,5 +1,5 @@
 .\"	from: @(#)rpcinfo.8c	2.2 88/08/03 4.0 RPCSRC; from 1.24 88/02/25 SMI
-.\"	$Id: rpcinfo.8,v 1.3 1997/02/22 19:56:44 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 17, 1987
 .Dt RPCINFO 8
diff --git a/usr.bin/rpcinfo/rpcinfo.c b/usr.bin/rpcinfo/rpcinfo.c
index 4b77f34c47b8..99089bb2f305 100644
--- a/usr.bin/rpcinfo/rpcinfo.c
+++ b/usr.bin/rpcinfo/rpcinfo.c
@@ -2,7 +2,7 @@
 /*static char sccsid[] = "from: @(#)rpcinfo.c 1.22 87/08/12 SMI";*/
 /*static char sccsid[] = "from: @(#)rpcinfo.c	2.2 88/08/11 4.0 RPCSRC";*/
 static char rcsid[] =
-	"$Id: rpcinfo.c,v 1.7 1998/06/09 04:30:56 imp Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/usr.bin/rs/rs.1 b/usr.bin/rs/rs.1
index a500d3f63dd3..d21bde35448e 100644
--- a/usr.bin/rs/rs.1
+++ b/usr.bin/rs/rs.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rs.1	8.2 (Berkeley) 12/30/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt RS 1
diff --git a/usr.bin/rs/rs.c b/usr.bin/rs/rs.c
index b495a8f630c2..bd7dc33dcce8 100644
--- a/usr.bin/rs/rs.c
+++ b/usr.bin/rs/rs.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)rs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: rs.c,v 1.3 1997/08/07 06:42:37 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/rsh/Makefile b/usr.bin/rsh/Makefile
index 5d545f94fdbd..6b102f4dc950 100644
--- a/usr.bin/rsh/Makefile
+++ b/usr.bin/rsh/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-#	$Id: Makefile,v 1.8 1998/09/19 22:42:05 obrien Exp $
+# $FreeBSD$
 
 PROG=	rsh
 SRCS=	rsh.c
diff --git a/usr.bin/rsh/rsh.1 b/usr.bin/rsh/rsh.1
index 291fd099d1c6..836d830d63d8 100644
--- a/usr.bin/rsh/rsh.1
+++ b/usr.bin/rsh/rsh.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rsh.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt RSH 1
diff --git a/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c
index 13f3c2163b80..deea9d94990d 100644
--- a/usr.bin/rsh/rsh.c
+++ b/usr.bin/rsh/rsh.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "From: @(#)rsh.c	8.3 (Berkeley) 4/6/94";
 #endif
 static const char rcsid[] =
-	"$Id: rsh.c,v 1.16 1998/10/09 06:47:57 markm Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/rup/Makefile b/usr.bin/rup/Makefile
index ab50a8a88f4c..2e67e374bfa7 100644
--- a/usr.bin/rup/Makefile
+++ b/usr.bin/rup/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	rup
 MAN1=	rup.1
diff --git a/usr.bin/rup/rup.1 b/usr.bin/rup/rup.1
index b19041548d7b..f7e83d715d12 100644
--- a/usr.bin/rup/rup.1
+++ b/usr.bin/rup/rup.1
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: rup.1,v 1.5 1997/02/22 19:56:48 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 7, 1993
 .Dt RUP 1
diff --git a/usr.bin/rup/rup.c b/usr.bin/rup/rup.c
index 89b6ffb3c1b8..b916e9d23440 100644
--- a/usr.bin/rup/rup.c
+++ b/usr.bin/rup/rup.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: rup.c,v 1.9 1997/09/15 09:46:42 jkh Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/ruptime/ruptime.1 b/usr.bin/ruptime/ruptime.1
index 2d8de0d22a5d..175856aa3bdb 100644
--- a/usr.bin/ruptime/ruptime.1
+++ b/usr.bin/ruptime/ruptime.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ruptime.1	8.2 (Berkeley) 4/5/94
-.\"	$Id: ruptime.1,v 1.5 1999/08/14 01:04:10 chris Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 5, 1994
 .Dt RUPTIME 1
diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c
index e075d920c5b9..ab275b901bbe 100644
--- a/usr.bin/ruptime/ruptime.c
+++ b/usr.bin/ruptime/ruptime.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: ruptime.c,v 1.10 1997/03/29 04:32:02 imp Exp $ */
+/* $FreeBSD$ */
 
 #ifndef lint
 static char copyright[] =
diff --git a/usr.bin/rusers/Makefile b/usr.bin/rusers/Makefile
index a6b753ff4e5a..6ec50ab8ea50 100644
--- a/usr.bin/rusers/Makefile
+++ b/usr.bin/rusers/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG = rusers
 MAN1 = rusers.1
diff --git a/usr.bin/rusers/rusers.1 b/usr.bin/rusers/rusers.1
index 424971e3b03a..05044f57816b 100644
--- a/usr.bin/rusers/rusers.1
+++ b/usr.bin/rusers/rusers.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)rusers.1	6.7 (Berkeley) 4/23/91
-.\"	$Id: rusers.1,v 1.5 1997/02/22 19:56:52 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 23, 1991
 .Dt RUSERS 1
diff --git a/usr.bin/rusers/rusers.c b/usr.bin/rusers/rusers.c
index 2ac8837aa2e4..a59abd62872d 100644
--- a/usr.bin/rusers/rusers.c
+++ b/usr.bin/rusers/rusers.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: rusers.c,v 1.6 1997/08/08 12:12:54 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/rwall/Makefile b/usr.bin/rwall/Makefile
index e81c30aafafe..33a2dcc6b634 100644
--- a/usr.bin/rwall/Makefile
+++ b/usr.bin/rwall/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG = rwall
 MAN1 = rwall.1
diff --git a/usr.bin/rwall/rwall.1 b/usr.bin/rwall/rwall.1
index d7265a05852d..abdcda5b5bbe 100644
--- a/usr.bin/rwall/rwall.1
+++ b/usr.bin/rwall/rwall.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)rwall.1	6.7 (Berkeley) 4/23/91
-.\"	$Id: rwall.1,v 1.4 1997/02/22 19:56:55 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 23, 1991
 .Dt RWALL 1
diff --git a/usr.bin/rwall/rwall.c b/usr.bin/rwall/rwall.c
index a39e478a8840..214a5a59236e 100644
--- a/usr.bin/rwall/rwall.c
+++ b/usr.bin/rwall/rwall.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "from: @(#)wall.c	5.14 (Berkeley) 3/2/91";
 #endif
 static const char rcsid[] =
-	"$Id: rwall.c,v 1.6 1997/08/08 12:18:16 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/rwho/rwho.1 b/usr.bin/rwho/rwho.1
index edd0288f4d7d..3568c2d22879 100644
--- a/usr.bin/rwho/rwho.1
+++ b/usr.bin/rwho/rwho.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rwho.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt RWHO 1
diff --git a/usr.bin/rwho/rwho.c b/usr.bin/rwho/rwho.c
index 2a6a7ab483ef..c9045f1f9e2f 100644
--- a/usr.bin/rwho/rwho.c
+++ b/usr.bin/rwho/rwho.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)rwho.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: rwho.c,v 1.11 1997/08/08 12:20:24 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/sasc/sasc.1 b/usr.bin/sasc/sasc.1
index 325f6fd45321..cf5635ecd842 100644
--- a/usr.bin/sasc/sasc.1
+++ b/usr.bin/sasc/sasc.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: sasc.1,v 1.6 1997/08/08 12:22:29 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 6, 1995
 .Dt SASC 1
diff --git a/usr.bin/sasc/sasc.c b/usr.bin/sasc/sasc.c
index e811abfd9177..3b023ea8eaa6 100644
--- a/usr.bin/sasc/sasc.c
+++ b/usr.bin/sasc/sasc.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/script/script.1 b/usr.bin/script/script.1
index 277c5f7f1bcb..ac00cb1d29ad 100644
--- a/usr.bin/script/script.1
+++ b/usr.bin/script/script.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)script.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: script.1,v 1.5 1998/06/04 21:06:02 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt SCRIPT 1
diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c
index c4f3e917dee1..708a59b68e61 100644
--- a/usr.bin/script/script.c
+++ b/usr.bin/script/script.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)script.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: script.c,v 1.9 1998/09/19 09:45:42 des Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/sed/compile.c b/usr.bin/sed/compile.c
index 1313fcaec0f0..136f56ce1197 100644
--- a/usr.bin/sed/compile.c
+++ b/usr.bin/sed/compile.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)compile.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: compile.c,v 1.11 1998/12/07 05:35:54 archie Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c
index 353dedbc8e3d..88f4ea52b3e4 100644
--- a/usr.bin/sed/main.c
+++ b/usr.bin/sed/main.c
@@ -46,7 +46,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.2 (Berkeley) 1/3/94";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.7 1997/08/11 07:21:03 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/sed/misc.c b/usr.bin/sed/misc.c
index 237f67a3f50c..c9b013a8dbd9 100644
--- a/usr.bin/sed/misc.c
+++ b/usr.bin/sed/misc.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/sed/process.c b/usr.bin/sed/process.c
index cf0edbef809d..77ef93a58d96 100644
--- a/usr.bin/sed/process.c
+++ b/usr.bin/sed/process.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)process.c	8.6 (Berkeley) 4/20/94";
 #endif
 static const char rcsid[] =
-	"$Id: process.c,v 1.8 1998/12/07 05:33:39 archie Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index eb20cb04710d..96d94c5dc34a 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sed.1	8.2 (Berkeley) 12/30/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt SED 1
diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1
index da59e14d98ab..795d939c58dc 100644
--- a/usr.bin/shar/shar.1
+++ b/usr.bin/shar/shar.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)shar.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: shar.1,v 1.5 1997/04/27 08:45:46 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt SHAR 1
diff --git a/usr.bin/showmount/showmount.8 b/usr.bin/showmount/showmount.8
index 386efa0aab57..c2aae0484399 100644
--- a/usr.bin/showmount/showmount.8
+++ b/usr.bin/showmount/showmount.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)showmount.8	8.3 (Berkeley) 3/29/95
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd March 29, 1995
 .Dt SHOWMOUNT 8
diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c
index 08d7d5023f2b..ecc528d8e6ec 100644
--- a/usr.bin/showmount/showmount.c
+++ b/usr.bin/showmount/showmount.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)showmount.c	8.3 (Berkeley) 3/29/95";
 #endif
 static const char rcsid[] =
-	"$Id: showmount.c,v 1.6 1997/08/11 07:27:27 charnier Exp $";
+  "$FreeBSD$";
 #endif not lint
 
 #include <sys/types.h>
diff --git a/usr.bin/size/size.1 b/usr.bin/size/size.1
index 24341dbaad1e..1cd1f9f7bec7 100644
--- a/usr.bin/size/size.1
+++ b/usr.bin/size/size.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)size.1	8.2 (Berkeley) 4/18/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt SIZE 1
diff --git a/usr.bin/size/size.c b/usr.bin/size/size.c
index 69322d34b05d..b42e975da34a 100644
--- a/usr.bin/size/size.c
+++ b/usr.bin/size/size.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)size.c	8.2 (Berkeley) 12/9/93";
 #endif
 static const char rcsid[] =
-	"$Id: size.c,v 1.3 1997/08/11 07:28:19 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/sockstat/Makefile b/usr.bin/sockstat/Makefile
index eafc337e1d54..a72aadfe8ba8 100644
--- a/usr.bin/sockstat/Makefile
+++ b/usr.bin/sockstat/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/04/14 16:17:34 des Exp $
+# $FreeBSD$
 
 MAINTAINER=	des@freebsd.org
 MAN1=		sockstat.1
diff --git a/usr.bin/sockstat/sockstat.1 b/usr.bin/sockstat/sockstat.1
index d009bf93dfd9..b9b810bfb2f3 100644
--- a/usr.bin/sockstat/sockstat.1
+++ b/usr.bin/sockstat/sockstat.1
@@ -25,7 +25,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: sockstat.1,v 1.1 1999/04/15 13:40:43 des Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 13, 1999
 .Dt LSOCK 1
diff --git a/usr.bin/sockstat/sockstat.pl b/usr.bin/sockstat/sockstat.pl
index 9d9261c27f1b..3c251884cb49 100644
--- a/usr.bin/sockstat/sockstat.pl
+++ b/usr.bin/sockstat/sockstat.pl
@@ -26,7 +26,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: sockstat.pl,v 1.2 1999/05/01 11:31:19 des Exp $
+# $FreeBSD$
 #
 
 my (%myaddr, %hisaddr);
diff --git a/usr.bin/soelim/soelim.1 b/usr.bin/soelim/soelim.1
index aa5bf4d1c795..2c8c835d7c97 100644
--- a/usr.bin/soelim/soelim.1
+++ b/usr.bin/soelim/soelim.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)soelim.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt SOELIM 1
diff --git a/usr.bin/soelim/soelim.c b/usr.bin/soelim/soelim.c
index 635088a0a7c5..9152a2791b44 100644
--- a/usr.bin/soelim/soelim.c
+++ b/usr.bin/soelim/soelim.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)soelim.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/split/split.1 b/usr.bin/split/split.1
index 927250c26ffb..12759bf0de64 100644
--- a/usr.bin/split/split.1
+++ b/usr.bin/split/split.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)split.1	8.3 (Berkeley) 4/16/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 16, 1994
 .Dt SPLIT 1
diff --git a/usr.bin/strings/strings.1 b/usr.bin/strings/strings.1
index d644237ffafe..df660b0c333f 100644
--- a/usr.bin/strings/strings.1
+++ b/usr.bin/strings/strings.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strings.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt STRINGS 1
diff --git a/usr.bin/strings/strings.c b/usr.bin/strings/strings.c
index 80011677c3f5..6a49d632035e 100644
--- a/usr.bin/strings/strings.c
+++ b/usr.bin/strings/strings.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)strings.c	8.2 (Berkeley) 1/28/94";
 #endif
 static const char rcsid[] =
-	"$Id: strings.c,v 1.6 1997/08/11 07:31:28 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/strip/strip.1 b/usr.bin/strip/strip.1
index de225ab4832b..e91d6d9ada33 100644
--- a/usr.bin/strip/strip.1
+++ b/usr.bin/strip/strip.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strip.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: strip.1,v 1.5 1997/02/22 19:57:13 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt STRIP 1
diff --git a/usr.bin/strip/strip.1aout b/usr.bin/strip/strip.1aout
index de225ab4832b..e91d6d9ada33 100644
--- a/usr.bin/strip/strip.1aout
+++ b/usr.bin/strip/strip.1aout
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strip.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: strip.1,v 1.5 1997/02/22 19:57:13 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt STRIP 1
diff --git a/usr.bin/strip/strip.c b/usr.bin/strip/strip.c
index 7baf965d14bb..03ba76c6baac 100644
--- a/usr.bin/strip/strip.c
+++ b/usr.bin/strip/strip.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)strip.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: strip.c,v 1.10 1997/03/29 04:32:36 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile
index 2ffba8c85145..33064a4e089d 100644
--- a/usr.bin/su/Makefile
+++ b/usr.bin/su/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-#	$Id: Makefile,v 1.22 1999/08/13 16:51:40 sheldonh Exp $
+# $FreeBSD$
 
 PROG=	su
 SRCS=	su.c
diff --git a/usr.bin/su/su.1 b/usr.bin/su/su.1
index 78ce5f15bd1b..c7a05977a351 100644
--- a/usr.bin/su/su.1
+++ b/usr.bin/su/su.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)su.1	8.2 (Berkeley) 4/18/94
-.\"	$Id: su.1,v 1.14 1998/06/08 05:29:51 jkoshy Exp $
+.\" $FreeBSD$
 .\"
 .\" this is for hilit19's braindeadness: "
 .Dd April 18, 1994
diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c
index 72ace2656633..2e5651e9bfc0 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)su.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: su.c,v 1.31 1999/07/02 11:20:59 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/symorder/symorder.1 b/usr.bin/symorder/symorder.1
index 9769490e0142..51cd83b6d33e 100644
--- a/usr.bin/symorder/symorder.1
+++ b/usr.bin/symorder/symorder.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)symorder.1	6.5 (Berkeley) 4/22/91
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 22, 1991
 .Dt SYMORDER 1
diff --git a/usr.bin/symorder/symorder.c b/usr.bin/symorder/symorder.c
index 91302292ea1a..503c67eca60f 100644
--- a/usr.bin/symorder/symorder.c
+++ b/usr.bin/symorder/symorder.c
@@ -42,7 +42,7 @@ char const copyright[] =
 static char sccsid[] = "@(#)symorder.c	5.8 (Berkeley) 4/1/91";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/systat/cmds.c b/usr.bin/systat/cmds.c
index bbdb58e6a83d..e15d7e28a50b 100644
--- a/usr.bin/systat/cmds.c
+++ b/usr.bin/systat/cmds.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmds.c	8.2 (Berkeley) 4/29/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/usr.bin/systat/cmdtab.c b/usr.bin/systat/cmdtab.c
index 83b5b02476a1..ffb0259d474a 100644
--- a/usr.bin/systat/cmdtab.c
+++ b/usr.bin/systat/cmdtab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
 */
 static const char rcsid[] =
-	"$Id: cmdtab.c,v 1.3 1997/09/25 00:37:31 wollman Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "systat.h"
diff --git a/usr.bin/systat/devs.c b/usr.bin/systat/devs.c
index ac13b768e118..6f9c8117063e 100644
--- a/usr.bin/systat/devs.c
+++ b/usr.bin/systat/devs.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: devs.c,v 1.2 1998/09/20 00:11:23 ken Exp $
+ * $FreeBSD$
  */
 /*
  * Some code and ideas taken from the old disks.c.
diff --git a/usr.bin/systat/devs.h b/usr.bin/systat/devs.h
index ce49c40d0ab9..ec656543b91b 100644
--- a/usr.bin/systat/devs.h
+++ b/usr.bin/systat/devs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 int dsinit(int, struct statinfo *, struct statinfo *, struct statinfo *);
diff --git a/usr.bin/systat/icmp.c b/usr.bin/systat/icmp.c
index 458aa84edfc6..3b5b82935364 100644
--- a/usr.bin/systat/icmp.c
+++ b/usr.bin/systat/icmp.c
@@ -38,7 +38,7 @@ static const char rcsid[] =
 	"Id: mbufs.c,v 1.5 1997/02/24 20:59:03 wollman Exp";
 */
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c
index 21d4424e151f..b499a8b21046 100644
--- a/usr.bin/systat/iostat.c
+++ b/usr.bin/systat/iostat.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iostat.c,v 1.6 1998/09/15 08:16:40 gibbs Exp $
+ * $FreeBSD$
  */
 /*
  * Copyright (c) 1980, 1992, 1993
diff --git a/usr.bin/systat/ip.c b/usr.bin/systat/ip.c
index 4501af17791f..d54c76ddb41d 100644
--- a/usr.bin/systat/ip.c
+++ b/usr.bin/systat/ip.c
@@ -38,7 +38,7 @@ static const char rcsid[] =
 	"Id: mbufs.c,v 1.5 1997/02/24 20:59:03 wollman Exp";
 */
 static const char rcsid[] =
-	"$Id: ip.c,v 1.1 1997/09/25 00:37:32 wollman Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c
index 44310948040e..8454682e8eba 100644
--- a/usr.bin/systat/main.c
+++ b/usr.bin/systat/main.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.9 1998/07/06 22:07:58 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/systat/mbufs.c b/usr.bin/systat/mbufs.c
index 389e143e9662..f542da99e727 100644
--- a/usr.bin/systat/mbufs.c
+++ b/usr.bin/systat/mbufs.c
@@ -34,7 +34,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
 static const char rcsid[] =
-	"$Id: mbufs.c,v 1.7 1998/06/09 04:17:21 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/systat/mode.c b/usr.bin/systat/mode.c
index 17d79b00df45..3eb85c033f1b 100644
--- a/usr.bin/systat/mode.c
+++ b/usr.bin/systat/mode.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/usr.bin/systat/mode.h b/usr.bin/systat/mode.h
index 586ecb1f11fd..caa6bae7e246 100644
--- a/usr.bin/systat/mode.h
+++ b/usr.bin/systat/mode.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c
index 479b33673eb0..b5d0422143a8 100644
--- a/usr.bin/systat/netcmds.c
+++ b/usr.bin/systat/netcmds.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)netcmds.c	8.1 (Berkeley) 6/6/93";
 */
 static const char rcsid[] =
-	"$Id: netcmds.c,v 1.7 1997/12/04 03:44:44 steve Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c
index 227f210711e5..ba53fdae58ab 100644
--- a/usr.bin/systat/netstat.c
+++ b/usr.bin/systat/netstat.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)netstat.c	8.1 (Berkeley) 6/6/93";
 */
 static const char rcsid[] =
-	"$Id: netstat.c,v 1.10 1998/06/12 14:15:24 peter Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/systat/swap.c b/usr.bin/systat/swap.c
index fa323b00599c..eda7b91f1207 100644
--- a/usr.bin/systat/swap.c
+++ b/usr.bin/systat/swap.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)swap.c	8.3 (Berkeley) 4/29/95";
 #endif
 static const char rcsid[] =
-	"$Id: swap.c,v 1.10 1999/02/06 06:43:56 dillon Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index c39031b8074d..cbbd77b748ca 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)systat.1	8.2 (Berkeley) 12/30/93
-.\"	$Id: systat.1,v 1.19 1999/07/30 07:44:25 des Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 9, 1997
 .Dt SYSTAT 1
diff --git a/usr.bin/systat/systat.h b/usr.bin/systat/systat.h
index 72f0f284fdf8..d8045d8fecff 100644
--- a/usr.bin/systat/systat.h
+++ b/usr.bin/systat/systat.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)systat.h	8.1 (Berkeley) 6/6/93
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <curses.h>
diff --git a/usr.bin/systat/tcp.c b/usr.bin/systat/tcp.c
index e0edbe1c199a..433721ec187f 100644
--- a/usr.bin/systat/tcp.c
+++ b/usr.bin/systat/tcp.c
@@ -38,7 +38,7 @@ static const char rcsid[] =
 	"Id: mbufs.c,v 1.5 1997/02/24 20:59:03 wollman Exp";
 */
 static const char rcsid[] =
-	"$Id: tcp.c,v 1.1 1997/09/27 00:44:55 wollman Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index d3b5a68d322b..184c7e66152d 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 1/12/94";
 #endif
 static const char rcsid[] =
-	"$Id: vmstat.c,v 1.35 1999/03/22 03:44:01 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tail/reverse.c b/usr.bin/tail/reverse.c
index 6efe193aed32..7acf45063725 100644
--- a/usr.bin/tail/reverse.c
+++ b/usr.bin/tail/reverse.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)reverse.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: reverse.c,v 1.7 1997/08/13 06:46:56 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/tail/tail.1 b/usr.bin/tail/tail.1
index 39864d09c684..8ffb8b7c8683 100644
--- a/usr.bin/tail/tail.1
+++ b/usr.bin/tail/tail.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tail.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt TAIL 1
diff --git a/usr.bin/talk/Makefile b/usr.bin/talk/Makefile
index 921a12e168ad..bddde1ba259f 100644
--- a/usr.bin/talk/Makefile
+++ b/usr.bin/talk/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	talk
 DPADD=	${LIBCURSES} ${LIBTERMCAP}
diff --git a/usr.bin/talk/ctl.c b/usr.bin/talk/ctl.c
index f4cdcd111f4b..c8094b47c51d 100644
--- a/usr.bin/talk/ctl.c
+++ b/usr.bin/talk/ctl.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)ctl.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: ctl.c,v 1.4 1998/01/14 07:20:59 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/talk/ctl_transact.c b/usr.bin/talk/ctl_transact.c
index 2f2d8430bbb2..fa3ebad7a5c8 100644
--- a/usr.bin/talk/ctl_transact.c
+++ b/usr.bin/talk/ctl_transact.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)ctl_transact.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.bin/talk/display.c b/usr.bin/talk/display.c
index 8dbd7583d386..16c7605d447d 100644
--- a/usr.bin/talk/display.c
+++ b/usr.bin/talk/display.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)display.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/talk/get_addrs.c b/usr.bin/talk/get_addrs.c
index 641f80fa3237..871dc9ac786b 100644
--- a/usr.bin/talk/get_addrs.c
+++ b/usr.bin/talk/get_addrs.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)get_addrs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/talk/get_iface.c b/usr.bin/talk/get_iface.c
index 1d303e8dd031..05a8368e6b1f 100644
--- a/usr.bin/talk/get_iface.c
+++ b/usr.bin/talk/get_iface.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: get_iface.c,v 1.5 1998/01/14 07:21:03 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.bin/talk/get_names.c b/usr.bin/talk/get_names.c
index 762f4ff83700..73e20a162bd9 100644
--- a/usr.bin/talk/get_names.c
+++ b/usr.bin/talk/get_names.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)get_names.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/talk/init_disp.c b/usr.bin/talk/init_disp.c
index c5cd612a474d..b752e0aa4926 100644
--- a/usr.bin/talk/init_disp.c
+++ b/usr.bin/talk/init_disp.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)init_disp.c	8.2 (Berkeley) 2/16/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/talk/invite.c b/usr.bin/talk/invite.c
index a788d43bd00d..f941c8dde78d 100644
--- a/usr.bin/talk/invite.c
+++ b/usr.bin/talk/invite.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)invite.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/talk/io.c b/usr.bin/talk/io.c
index 4770d5b0c3a5..9653e1b11d7d 100644
--- a/usr.bin/talk/io.c
+++ b/usr.bin/talk/io.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)io.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: io.c,v 1.6 1998/01/14 07:21:10 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/talk/look_up.c b/usr.bin/talk/look_up.c
index fad2e391d2ae..3c6f3edc2765 100644
--- a/usr.bin/talk/look_up.c
+++ b/usr.bin/talk/look_up.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)look_up.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.bin/talk/msgs.c b/usr.bin/talk/msgs.c
index ea9560887689..82c5038fc447 100644
--- a/usr.bin/talk/msgs.c
+++ b/usr.bin/talk/msgs.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)msgs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/talk/talk.1 b/usr.bin/talk/talk.1
index 8226e9df5542..64bf639f86ce 100644
--- a/usr.bin/talk/talk.1
+++ b/usr.bin/talk/talk.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)talk.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt TALK 1
diff --git a/usr.bin/talk/talk.c b/usr.bin/talk/talk.c
index 09b6c753f1ea..d71d49ae2b7d 100644
--- a/usr.bin/talk/talk.c
+++ b/usr.bin/talk/talk.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)talk.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "talk.h"
diff --git a/usr.bin/tconv/Makefile b/usr.bin/tconv/Makefile
index 0a4af30bbe34..403397f67e4a 100644
--- a/usr.bin/tconv/Makefile
+++ b/usr.bin/tconv/Makefile
@@ -1,5 +1,5 @@
 # Makefile for tconv
-# $Id$
+# $FreeBSD$
 
 PROG=   tconv
 SRCS=   tconv.c quit.c
diff --git a/usr.bin/tconv/tconv.1 b/usr.bin/tconv/tconv.1
index 1a6d0c5bf651..2cfa9c100989 100644
--- a/usr.bin/tconv/tconv.1
+++ b/usr.bin/tconv/tconv.1
@@ -1,5 +1,5 @@
 .\" @(#) mytinfo tconv.1 3.2 92/02/01 public domain, By Ross Ridge
-.\" $Id: tconv.1,v 1.8 1997/08/13 06:58:44 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 1, 1992
 .Dt TCONV 1
diff --git a/usr.bin/tconv/tconv.c b/usr.bin/tconv/tconv.c
index 5beeb1becc53..a9d035d028d6 100644
--- a/usr.bin/tconv/tconv.c
+++ b/usr.bin/tconv/tconv.c
@@ -58,7 +58,7 @@
 static const char SCCSid[] =
 	"@(#) mytinfo tconv.c 3.2 92/02/01 public domain, By Ross Ridge";
 static const char rcsid[] =
-	"$Id: tconv.c,v 1.3 1997/08/13 06:58:45 charnier Exp $";
+  "$FreeBSD$";
 #endif
 
 /* the right margin of the output */
diff --git a/usr.bin/tcopy/tcopy.1 b/usr.bin/tcopy/tcopy.1
index 9155207375fc..85a344eed2fa 100644
--- a/usr.bin/tcopy/tcopy.1
+++ b/usr.bin/tcopy/tcopy.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tcopy.1	8.2 (Berkeley) 4/17/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 17, 1994
 .Dt TCOPY 1
diff --git a/usr.bin/tcopy/tcopy.c b/usr.bin/tcopy/tcopy.c
index 3b9ffdd81a5b..18be38f28c17 100644
--- a/usr.bin/tcopy/tcopy.c
+++ b/usr.bin/tcopy/tcopy.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tcopy.c	8.2 (Berkeley) 4/17/94";
 #endif
 static const char rcsid[] =
-	"$Id: tcopy.c,v 1.5 1999/04/30 13:13:32 phk Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tee/tee.1 b/usr.bin/tee/tee.1
index 271afde59077..adacd0764ff5 100644
--- a/usr.bin/tee/tee.1
+++ b/usr.bin/tee/tee.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tee.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt TEE 1
diff --git a/usr.bin/tee/tee.c b/usr.bin/tee/tee.c
index d844c5b00ba4..c393200780c1 100644
--- a/usr.bin/tee/tee.c
+++ b/usr.bin/tee/tee.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tee.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1
index 7091304b46f2..ca2e968be6fd 100644
--- a/usr.bin/telnet/telnet.1
+++ b/usr.bin/telnet/telnet.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)telnet.1	8.5 (Berkeley) 3/1/94
-.\"	$Id: telnet.1,v 1.12 1999/06/17 07:12:39 ru Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 1, 1994
 .Dt TELNET 1
diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c
index 3c6a15116d47..4ae5dc4c11c0 100644
--- a/usr.bin/tftp/main.c
+++ b/usr.bin/tftp/main.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.6 1998/06/09 04:31:02 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
diff --git a/usr.bin/tftp/tftp.1 b/usr.bin/tftp/tftp.1
index 85ab1af52151..0f87f58f39ce 100644
--- a/usr.bin/tftp/tftp.1
+++ b/usr.bin/tftp/tftp.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tftp.1	8.2 (Berkeley) 4/18/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt TFTP 1
diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c
index ae517a486329..9dc00afeddba 100644
--- a/usr.bin/tftp/tftp.c
+++ b/usr.bin/tftp/tftp.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)tftp.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: tftp.c,v 1.3 1998/02/20 04:30:34 jb Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
diff --git a/usr.bin/tftp/tftpsubs.c b/usr.bin/tftp/tftpsubs.c
index 277d561403e0..5f3549d7dcf8 100644
--- a/usr.bin/tftp/tftpsubs.c
+++ b/usr.bin/tftp/tftpsubs.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)tftpsubs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /* Simple minded read-ahead/write-behind subroutines for tftp user and
diff --git a/usr.bin/time/time.1 b/usr.bin/time/time.1
index b2b2a50be597..4d29566bfbfa 100644
--- a/usr.bin/time/time.1
+++ b/usr.bin/time/time.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)time.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt TIME 1
diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c
index 1400a97e5859..960d00e27aac 100644
--- a/usr.bin/time/time.c
+++ b/usr.bin/time/time.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)time.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: time.c,v 1.12 1998/10/13 14:52:32 des Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tip/libacu/acucommon.c b/usr.bin/tip/libacu/acucommon.c
index fe0d146b1783..efb644fce7d6 100644
--- a/usr.bin/tip/libacu/acucommon.c
+++ b/usr.bin/tip/libacu/acucommon.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)acucommon.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/libacu/unidialer.c b/usr.bin/tip/libacu/unidialer.c
index bac2368c0772..0206571007a1 100644
--- a/usr.bin/tip/libacu/unidialer.c
+++ b/usr.bin/tip/libacu/unidialer.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)unidialer.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: unidialer.c,v 1.5 1997/08/18 07:15:41 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/libacu/ventel.c b/usr.bin/tip/libacu/ventel.c
index a438b4252e43..08f2be588e62 100644
--- a/usr.bin/tip/libacu/ventel.c
+++ b/usr.bin/tip/libacu/ventel.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)ventel.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/tip/acu.c b/usr.bin/tip/tip/acu.c
index 3f65c5547334..3ee0381f9468 100644
--- a/usr.bin/tip/tip/acu.c
+++ b/usr.bin/tip/tip/acu.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)acu.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: acu.c,v 1.3 1997/08/18 07:15:58 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/acutab.c b/usr.bin/tip/tip/acutab.c
index cb0dd85a1342..2d38c7d3efb8 100644
--- a/usr.bin/tip/tip/acutab.c
+++ b/usr.bin/tip/tip/acutab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)acutab.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/cmds.c b/usr.bin/tip/tip/cmds.c
index c605022e87d3..f0caf1e648d8 100644
--- a/usr.bin/tip/tip/cmds.c
+++ b/usr.bin/tip/tip/cmds.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmds.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: cmds.c,v 1.8 1998/10/03 11:01:39 dfr Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/cmdtab.c b/usr.bin/tip/tip/cmdtab.c
index f9efc7b05dc9..3ad19e89afa8 100644
--- a/usr.bin/tip/tip/cmdtab.c
+++ b/usr.bin/tip/tip/cmdtab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/cu.c b/usr.bin/tip/tip/cu.c
index 50955fc6a129..2b3b2ed60d42 100644
--- a/usr.bin/tip/tip/cu.c
+++ b/usr.bin/tip/tip/cu.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cu.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: cu.c,v 1.2 1997/08/18 07:16:02 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/hunt.c b/usr.bin/tip/tip/hunt.c
index 0f71ea97fa95..90f7a613ad70 100644
--- a/usr.bin/tip/tip/hunt.c
+++ b/usr.bin/tip/tip/hunt.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)hunt.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tip/tip/log.c b/usr.bin/tip/tip/log.c
index acf5d87e4cd4..20004e8aa683 100644
--- a/usr.bin/tip/tip/log.c
+++ b/usr.bin/tip/tip/log.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)log.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: log.c,v 1.2 1997/08/18 07:16:03 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/modems.5 b/usr.bin/tip/tip/modems.5
index 0e74ca2d3df1..5fd486699ed5 100644
--- a/usr.bin/tip/tip/modems.5
+++ b/usr.bin/tip/tip/modems.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)modems.5	3/24/95
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd March 24, 1995
 .Dt MODEMS 5
diff --git a/usr.bin/tip/tip/partab.c b/usr.bin/tip/tip/partab.c
index c49721e643f0..94b2ab195e5d 100644
--- a/usr.bin/tip/tip/partab.c
+++ b/usr.bin/tip/tip/partab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)partab.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/tip/remote.c b/usr.bin/tip/tip/remote.c
index 9071eb62028f..2bc934389252 100644
--- a/usr.bin/tip/tip/remote.c
+++ b/usr.bin/tip/tip/remote.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)remote.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/syslimits.h>
diff --git a/usr.bin/tip/tip/tip.1 b/usr.bin/tip/tip/tip.1
index 00ebfd7f538e..dd9327fe0769 100644
--- a/usr.bin/tip/tip/tip.1
+++ b/usr.bin/tip/tip/tip.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tip.1	8.4 (Berkeley) 4/18/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt TIP 1
diff --git a/usr.bin/tip/tip/tip.c b/usr.bin/tip/tip/tip.c
index 124286e6e1f4..810c9c6b123f 100644
--- a/usr.bin/tip/tip/tip.c
+++ b/usr.bin/tip/tip/tip.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tip.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: tip.c,v 1.9 1998/06/09 14:51:05 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/tip/tipout.c b/usr.bin/tip/tip/tipout.c
index d9417d68602d..c9292a870a30 100644
--- a/usr.bin/tip/tip/tipout.c
+++ b/usr.bin/tip/tip/tipout.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)tipout.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: tipout.c,v 1.4 1997/08/18 07:16:08 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "tip.h"
diff --git a/usr.bin/tip/tip/value.c b/usr.bin/tip/tip/value.c
index 52bcfeba1e62..8be5cd9a0db0 100644
--- a/usr.bin/tip/tip/value.c
+++ b/usr.bin/tip/tip/value.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)value.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: value.c,v 1.3 1997/08/18 07:16:12 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "tip.h"
diff --git a/usr.bin/tip/tip/vars.c b/usr.bin/tip/tip/vars.c
index 34d604e6d0c9..6aba4993e23d 100644
--- a/usr.bin/tip/tip/vars.c
+++ b/usr.bin/tip/tip/vars.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)vars.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: vars.c,v 1.2 1997/08/18 07:16:12 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tn3270/api/api_bsd.c b/usr.bin/tn3270/api/api_bsd.c
index 7a884e83a12c..0e39a855b0fd 100644
--- a/usr.bin/tn3270/api/api_bsd.c
+++ b/usr.bin/tn3270/api/api_bsd.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)api_bsd.c	8.2 (Berkeley) 1/7/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #if	defined(unix)
diff --git a/usr.bin/tn3270/ascii/mset.c b/usr.bin/tn3270/ascii/mset.c
index a26852d27cbe..8e344930320d 100644
--- a/usr.bin/tn3270/ascii/mset.c
+++ b/usr.bin/tn3270/ascii/mset.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mset.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tn3270/mset/map3270.5 b/usr.bin/tn3270/mset/map3270.5
index 40a49781328a..d9249f563191 100644
--- a/usr.bin/tn3270/mset/map3270.5
+++ b/usr.bin/tn3270/mset/map3270.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)map3270.5	8.4 (Berkeley) 6/1/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH MAP3270 5  "June 1, 1994"
 .UC 6
diff --git a/usr.bin/tn3270/mset/mset.1 b/usr.bin/tn3270/mset/mset.1
index 362493bd32ce..8caa8aa25aa2 100644
--- a/usr.bin/tn3270/mset/mset.1
+++ b/usr.bin/tn3270/mset/mset.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mset.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt MSET 1
diff --git a/usr.bin/tn3270/tn3270/tn3270.1 b/usr.bin/tn3270/tn3270/tn3270.1
index 41d795494ee1..d1675a782a93 100644
--- a/usr.bin/tn3270/tn3270/tn3270.1
+++ b/usr.bin/tn3270/tn3270/tn3270.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tn3270.1	8.2 (Berkeley) 4/18/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt TN3270 1
diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c
index ee651d03ccc9..a3935021d162 100644
--- a/usr.bin/top/machine.c
+++ b/usr.bin/top/machine.c
@@ -19,7 +19,7 @@
  *          Steven Wallace  <swallace@freebsd.org>
  *          Wolfram Schneider <wosch@FreeBSD.org>
  *
- * $Id: machine.c,v 1.25 1999/05/11 14:32:15 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/usr.bin/touch/touch.1 b/usr.bin/touch/touch.1
index dbb337774174..b1583f316f67 100644
--- a/usr.bin/touch/touch.1
+++ b/usr.bin/touch/touch.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)touch.1	8.3 (Berkeley) 4/28/95
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 28, 1995
 .Dt TOUCH 1
diff --git a/usr.bin/tput/tput.1 b/usr.bin/tput/tput.1
index e48f9f57be90..834f49e78585 100644
--- a/usr.bin/tput/tput.1
+++ b/usr.bin/tput/tput.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tput.1	8.2 (Berkeley) 3/19/94
-.\"	$Id: tput.1,v 1.3 1997/04/27 08:45:46 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 19, 1994
 .Dt TPUT 1
diff --git a/usr.bin/tr/str.c b/usr.bin/tr/str.c
index 55ad1bd448bc..ff27e4add3ce 100644
--- a/usr.bin/tr/str.c
+++ b/usr.bin/tr/str.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)str.c	8.2 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/tr/tr.1 b/usr.bin/tr/tr.1
index d38ab2a0dad6..7403dba1619b 100644
--- a/usr.bin/tr/tr.1
+++ b/usr.bin/tr/tr.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tr.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd October 11, 1997
 .Dt TR 1
diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c
index 52ccb1a1c8c8..b842e6d3452f 100644
--- a/usr.bin/tr/tr.c
+++ b/usr.bin/tr/tr.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tr.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: tr.c,v 1.6 1997/08/18 07:24:58 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <locale.h>
diff --git a/usr.bin/true/true.1 b/usr.bin/true/true.1
index c0bf4d2fade5..1eee432284c2 100644
--- a/usr.bin/true/true.1
+++ b/usr.bin/true/true.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)true.1	8.1 (Berkeley) 6/9/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt TRUE 1
diff --git a/usr.bin/truss/alpha-fbsd.c b/usr.bin/truss/alpha-fbsd.c
index 09f7394de4ed..125e126da9c4 100644
--- a/usr.bin/truss/alpha-fbsd.c
+++ b/usr.bin/truss/alpha-fbsd.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: alpha-fbsd.c,v 1.1 1998/10/03 00:43:05 sef Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/amd64-fbsd32.c b/usr.bin/truss/amd64-fbsd32.c
index 3096c82c2bdf..463f475cefaf 100644
--- a/usr.bin/truss/amd64-fbsd32.c
+++ b/usr.bin/truss/amd64-fbsd32.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: i386-fbsd.c,v 1.5 1998/01/09 09:31:40 sef Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/amd64-linux32.c b/usr.bin/truss/amd64-linux32.c
index 2d334ba01540..ec7632b83e0d 100644
--- a/usr.bin/truss/amd64-linux32.c
+++ b/usr.bin/truss/amd64-linux32.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: i386-linux.c,v 1.5 1998/01/09 09:31:42 sef Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/i386-fbsd.c b/usr.bin/truss/i386-fbsd.c
index 3096c82c2bdf..463f475cefaf 100644
--- a/usr.bin/truss/i386-fbsd.c
+++ b/usr.bin/truss/i386-fbsd.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: i386-fbsd.c,v 1.5 1998/01/09 09:31:40 sef Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/i386-linux.c b/usr.bin/truss/i386-linux.c
index 2d334ba01540..ec7632b83e0d 100644
--- a/usr.bin/truss/i386-linux.c
+++ b/usr.bin/truss/i386-linux.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: i386-linux.c,v 1.5 1998/01/09 09:31:42 sef Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/main.c b/usr.bin/truss/main.c
index b82db46c9be6..ab5c0bae20dd 100644
--- a/usr.bin/truss/main.c
+++ b/usr.bin/truss/main.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: main.c,v 1.12 1998/10/03 00:43:05 sef Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/setup.c b/usr.bin/truss/setup.c
index fbef7e11a30b..afa011308e93 100644
--- a/usr.bin/truss/setup.c
+++ b/usr.bin/truss/setup.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: setup.c,v 1.7 1998/01/05 07:30:25 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/syscall.h b/usr.bin/truss/syscall.h
index 5f3757c81ef2..2b3c66b5928c 100644
--- a/usr.bin/truss/syscall.h
+++ b/usr.bin/truss/syscall.h
@@ -18,7 +18,7 @@
  * IN (meaning that the data is passed *into* the system call).
  */
 /*
- * $Id: syscall.h,v 1.3 1997/12/20 18:40:41 sef Exp $
+ * $FreeBSD$
  */
 
 enum Argtype { None = 1, Hex, Octal, Int, String, Ptr, Stat, Ioctl, Quad,
diff --git a/usr.bin/truss/syscalls.c b/usr.bin/truss/syscalls.c
index 53865fddcb43..bdd087bbf50c 100644
--- a/usr.bin/truss/syscalls.c
+++ b/usr.bin/truss/syscalls.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: syscalls.c,v 1.7 1999/08/05 12:03:50 des Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tset/map.c b/usr.bin/tset/map.c
index 056f367c39bc..016afb1ff596 100644
--- a/usr.bin/tset/map.c
+++ b/usr.bin/tset/map.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)map.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id: map.c,v 1.4 1997/08/18 07:27:53 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tset/misc.c b/usr.bin/tset/misc.c
index 1e94df18c83a..4d8d705a9a25 100644
--- a/usr.bin/tset/misc.c
+++ b/usr.bin/tset/misc.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <fcntl.h>
diff --git a/usr.bin/tset/set.c b/usr.bin/tset/set.c
index 68fa7a2259c0..0f3081437d60 100644
--- a/usr.bin/tset/set.c
+++ b/usr.bin/tset/set.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)set.c	8.2 (Berkeley) 2/28/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <termios.h>
diff --git a/usr.bin/tset/term.c b/usr.bin/tset/term.c
index f64b86944176..857f9b1737bf 100644
--- a/usr.bin/tset/term.c
+++ b/usr.bin/tset/term.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)term.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id: term.c,v 1.2 1997/08/18 07:27:56 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tset/tset.1 b/usr.bin/tset/tset.1
index fb07cf18b999..bb0481ad9be6 100644
--- a/usr.bin/tset/tset.1
+++ b/usr.bin/tset/tset.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tset.1	8.1 (Berkeley) 6/9/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt TSET 1
diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c
index a097dcac8eef..df6b5b452d1a 100644
--- a/usr.bin/tset/tset.c
+++ b/usr.bin/tset/tset.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tset.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcdif[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tset/wrterm.c b/usr.bin/tset/wrterm.c
index d6274cfd1e04..8c5936898d63 100644
--- a/usr.bin/tset/wrterm.c
+++ b/usr.bin/tset/wrterm.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)wrterm.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tsort/tsort.1 b/usr.bin/tsort/tsort.1
index 8d9f25f1b294..6be1978fc06d 100644
--- a/usr.bin/tsort/tsort.1
+++ b/usr.bin/tsort/tsort.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tsort.1	8.3 (Berkeley) 4/1/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 1, 1994
 .Dt TSORT 1
diff --git a/usr.bin/tsort/tsort.c b/usr.bin/tsort/tsort.c
index fca46e904856..2f73a80d1fe9 100644
--- a/usr.bin/tsort/tsort.c
+++ b/usr.bin/tsort/tsort.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: tsort.c,v 1.8 1997/03/29 04:33:15 imp Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/tty/tty.1 b/usr.bin/tty/tty.1
index 67f2d634b351..dbf0e777661c 100644
--- a/usr.bin/tty/tty.1
+++ b/usr.bin/tty/tty.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tty.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: tty.1,v 1.4 1997/02/22 19:57:29 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt TTY 1
diff --git a/usr.bin/tty/tty.c b/usr.bin/tty/tty.c
index 7a7e688d8a3e..4d02fa9dccd4 100644
--- a/usr.bin/tty/tty.c
+++ b/usr.bin/tty/tty.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tty.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.bin/ul/ul.1 b/usr.bin/ul/ul.1
index b84e826f8910..470fea1450a2 100644
--- a/usr.bin/ul/ul.1
+++ b/usr.bin/ul/ul.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ul.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt UL 1
diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c
index f6fbdf035b7e..cfdd55245690 100644
--- a/usr.bin/ul/ul.c
+++ b/usr.bin/ul/ul.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ul.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: ul.c,v 1.4 1997/08/20 11:01:59 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/uname/uname.1 b/usr.bin/uname/uname.1
index b2d1168cf79b..08f7508312e4 100644
--- a/usr.bin/uname/uname.1
+++ b/usr.bin/uname/uname.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)uname.1	8.3 (Berkeley) 4/8/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 8, 1994
 .Dt UNAME 1
diff --git a/usr.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c
index 4d70913d7b2d..ed05c85d73af 100644
--- a/usr.bin/unexpand/unexpand.c
+++ b/usr.bin/unexpand/unexpand.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)unexpand.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: unexpand.c,v 1.3 1997/08/26 11:02:36 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/unifdef/unifdef.1 b/usr.bin/unifdef/unifdef.1
index d0509692b49a..2c06332d938e 100644
--- a/usr.bin/unifdef/unifdef.1
+++ b/usr.bin/unifdef/unifdef.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)unifdef.1	8.2 (Berkeley) 4/1/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 1, 1994
 .Dt UNIFDEF 1
diff --git a/usr.bin/unifdef/unifdef.c b/usr.bin/unifdef/unifdef.c
index 58b92de9ceaf..0b7344b2eb77 100644
--- a/usr.bin/unifdef/unifdef.c
+++ b/usr.bin/unifdef/unifdef.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)unifdef.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: unifdef.c,v 1.2 1997/08/20 11:07:53 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/uniq/uniq.1 b/usr.bin/uniq/uniq.1
index 1728369f959b..e14dd517cda1 100644
--- a/usr.bin/uniq/uniq.1
+++ b/usr.bin/uniq/uniq.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)uniq.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: uniq.1,v 1.3 1997/09/07 15:09:22 joerg Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt UNIQ 1
diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c
index fe47d42c3175..0cc7977bbaf7 100644
--- a/usr.bin/uniq/uniq.c
+++ b/usr.bin/uniq/uniq.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)uniq.c	8.3 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: uniq.c,v 1.4 1997/09/07 15:09:22 joerg Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/units/Makefile b/usr.bin/units/Makefile
index 5f4f8057fd57..946132c7bb99 100644
--- a/usr.bin/units/Makefile
+++ b/usr.bin/units/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1997/02/22 19:57:30 peter Exp $
+# $FreeBSD$
 
 PROG=	units
 
diff --git a/usr.bin/units/README b/usr.bin/units/README
index b7a173a38320..974cbe9fee3f 100644
--- a/usr.bin/units/README
+++ b/usr.bin/units/README
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 This is a program which I wrote as a clone of the UNIX 'units'
 command.  I threw it together in a couple days, but it seems to work,
diff --git a/usr.bin/units/pathnames.h b/usr.bin/units/pathnames.h
index f41f2077f168..227dd00b4922 100644
--- a/usr.bin/units/pathnames.h
+++ b/usr.bin/units/pathnames.h
@@ -1,4 +1,4 @@
-/*	$Id$	*/
+/* $FreeBSD$	*/
 
 /*
  * Copyright (c) 1993 Christopher G. Demetriou
diff --git a/usr.bin/units/units.1 b/usr.bin/units/units.1
index 85f0159a51ec..f1c2de8602e7 100644
--- a/usr.bin/units/units.1
+++ b/usr.bin/units/units.1
@@ -1,4 +1,4 @@
-.\" $Id: units.1,v 1.6 1997/08/21 06:49:32 charnier Exp $
+.\" $FreeBSD$
 .Dd July 14, 1993
 .Dt UNITS 1
 .Os
diff --git a/usr.bin/units/units.c b/usr.bin/units/units.c
index 3eae64b59130..7d1fd785d5b6 100644
--- a/usr.bin/units/units.c
+++ b/usr.bin/units/units.c
@@ -17,7 +17,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/units/units.lib b/usr.bin/units/units.lib
index f02649a78c78..a2f821459881 100644
--- a/usr.bin/units/units.lib
+++ b/usr.bin/units/units.lib
@@ -1,4 +1,4 @@
-/ $Id: units.lib,v 1.3 1997/02/22 19:57:34 peter Exp $
+/ $FreeBSD$
 
 / primitive units
 
diff --git a/usr.bin/unvis/unvis.1 b/usr.bin/unvis/unvis.1
index f16c3ff60c77..a3cb608a0d9c 100644
--- a/usr.bin/unvis/unvis.1
+++ b/usr.bin/unvis/unvis.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)unvis.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt UNVIS 1
diff --git a/usr.bin/unvis/unvis.c b/usr.bin/unvis/unvis.c
index 1549fd9ac249..418b74ec460b 100644
--- a/usr.bin/unvis/unvis.c
+++ b/usr.bin/unvis/unvis.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)unvis.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: unvis.c,v 1.3 1997/08/21 06:52:43 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/users/users.1 b/usr.bin/users/users.1
index 1542aa95a2c3..874960705300 100644
--- a/usr.bin/users/users.1
+++ b/usr.bin/users/users.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)users.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt USERS 1
diff --git a/usr.bin/users/users.c b/usr.bin/users/users.c
index a3ab2b5ba8c9..7acb26836e40 100644
--- a/usr.bin/users/users.c
+++ b/usr.bin/users/users.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)users.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: users.c,v 1.3 1997/08/22 06:50:33 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/uudecode/uudecode.c b/usr.bin/uudecode/uudecode.c
index bb01770f05b8..247e80212d1e 100644
--- a/usr.bin/uudecode/uudecode.c
+++ b/usr.bin/uudecode/uudecode.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)uudecode.c	8.2 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: uudecode.c,v 1.11 1998/01/25 19:25:54 wosch Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/uuencode/uuencode.1 b/usr.bin/uuencode/uuencode.1
index 784b39407f68..9616d6608974 100644
--- a/usr.bin/uuencode/uuencode.1
+++ b/usr.bin/uuencode/uuencode.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)uuencode.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: uuencode.1,v 1.6 1997/08/22 06:52:59 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt UUENCODE 1
diff --git a/usr.bin/uuencode/uuencode.c b/usr.bin/uuencode/uuencode.c
index b10a524a1900..e8696e900d0a 100644
--- a/usr.bin/uuencode/uuencode.c
+++ b/usr.bin/uuencode/uuencode.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)uuencode.c	8.2 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/uuencode/uuencode.format.5 b/usr.bin/uuencode/uuencode.format.5
index 4ffc7f217a3a..10f16995c8c1 100644
--- a/usr.bin/uuencode/uuencode.format.5
+++ b/usr.bin/uuencode/uuencode.format.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)uuencode.format.5	8.2 (Berkeley) 1/12/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd January 12, 1994
 .Dt UUENCODE 5
diff --git a/usr.bin/vacation/Makefile b/usr.bin/vacation/Makefile
index 6fc47954892c..ee668d894e64 100644
--- a/usr.bin/vacation/Makefile
+++ b/usr.bin/vacation/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	vacation
 CFLAGS+= -Wall
diff --git a/usr.bin/vacation/vacation.1 b/usr.bin/vacation/vacation.1
index e90eef6c7411..7d2c6aee6558 100644
--- a/usr.bin/vacation/vacation.1
+++ b/usr.bin/vacation/vacation.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)vacation.1	8.1 (Berkeley) 6/16/93
-.\"	$Id: vacation.1,v 1.7 1999/06/17 14:44:41 sheldonh Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1993
 .Dt VACATION 1
diff --git a/usr.bin/vacation/vacation.c b/usr.bin/vacation/vacation.c
index b94afe77ac80..98a2987abd3c 100644
--- a/usr.bin/vacation/vacation.c
+++ b/usr.bin/vacation/vacation.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)from: vacation.c	8.2 (Berkeley) 1/26/94";
 #endif
 static const char rcsid[] =
-	"$Id: vacation.c,v 1.16 1999/06/17 14:49:19 sheldonh Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/vgrind/vfontedpr.c b/usr.bin/vgrind/vfontedpr.c
index 8b5102aef366..09c63380307f 100644
--- a/usr.bin/vgrind/vfontedpr.c
+++ b/usr.bin/vgrind/vfontedpr.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)vfontedpr.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: vfontedpr.c,v 1.10 1997/09/18 14:07:33 phk Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vgrind/vgrind.1 b/usr.bin/vgrind/vgrind.1
index 513658f4df32..7e03ac7b0918 100644
--- a/usr.bin/vgrind/vgrind.1
+++ b/usr.bin/vgrind/vgrind.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vgrind.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt VGRIND 1
diff --git a/usr.bin/vgrind/vgrindefs.5 b/usr.bin/vgrind/vgrindefs.5
index 5449f77d2911..105442b80b45 100644
--- a/usr.bin/vgrind/vgrindefs.5
+++ b/usr.bin/vgrind/vgrindefs.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vgrindefs.5	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt VGRINDEFS 5
diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile
index 94b352ac8a2d..d2c463e06d2d 100644
--- a/usr.bin/vi/Makefile
+++ b/usr.bin/vi/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.23 1998/09/05 12:25:54 asami Exp $
+# $FreeBSD$
 #
 # This has most of the glue needed to compile tknvi and the perl hooks,
 # but not all.
diff --git a/usr.bin/vis/foldit.c b/usr.bin/vis/foldit.c
index 2bbf15d92f53..6cf63f35ac05 100644
--- a/usr.bin/vis/foldit.c
+++ b/usr.bin/vis/foldit.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)foldit.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.bin/vis/vis.1 b/usr.bin/vis/vis.1
index b2840580d3f7..47c080dffa24 100644
--- a/usr.bin/vis/vis.1
+++ b/usr.bin/vis/vis.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vis.1	8.4 (Berkeley) 4/19/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt VIS 1
diff --git a/usr.bin/vis/vis.c b/usr.bin/vis/vis.c
index edead0124b09..0ff6a21f0a0f 100644
--- a/usr.bin/vis/vis.c
+++ b/usr.bin/vis/vis.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)vis.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/vmstat/vmstat.8 b/usr.bin/vmstat/vmstat.8
index 7fb1ddb86010..860628e88693 100644
--- a/usr.bin/vmstat/vmstat.8
+++ b/usr.bin/vmstat/vmstat.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)vmstat.8	8.1 (Berkeley) 6/6/93
-.\"	$Id: vmstat.8,v 1.14 1999/04/26 14:08:04 kris Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1996
 .Dt VMSTAT 8
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index c67a1eb637c8..a06b44e0b9f1 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)vmstat.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: vmstat.c,v 1.35 1999/05/12 11:49:47 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/w/pr_time.c b/usr.bin/w/pr_time.c
index 5b38b58dd126..2a7eb1d1bf94 100644
--- a/usr.bin/w/pr_time.c
+++ b/usr.bin/w/pr_time.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)pr_time.c	8.2 (Berkeley) 4/4/94";
 #endif
 static const char rcsid[] =
-	"$Id: pr_time.c,v 1.11 1997/12/28 17:50:10 alex Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/w/uptime.1 b/usr.bin/w/uptime.1
index 87370c59782c..20ebaa0ffbd5 100644
--- a/usr.bin/w/uptime.1
+++ b/usr.bin/w/uptime.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)uptime.1	8.2 (Berkeley) 4/18/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt UPTIME 1
diff --git a/usr.bin/w/w.1 b/usr.bin/w/w.1
index 87d08ddd7306..12f3da808c13 100644
--- a/usr.bin/w/w.1
+++ b/usr.bin/w/w.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)w.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: w.1,v 1.10 1998/03/22 17:39:08 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt W 1
diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c
index ff3eb57583fb..6441ee8f8966 100644
--- a/usr.bin/w/w.c
+++ b/usr.bin/w/w.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)w.c	8.4 (Berkeley) 4/16/94";
 #endif
 static const char rcsid[] =
-	"$Id: w.c,v 1.35 1999/07/04 17:26:12 billf Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/wall/ttymsg.c b/usr.bin/wall/ttymsg.c
index 65890cac45bc..2b58a1b97eb8 100644
--- a/usr.bin/wall/ttymsg.c
+++ b/usr.bin/wall/ttymsg.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)ttymsg.c	8.2 (Berkeley) 11/16/93";
 #endif
 static const char rcsid[] =
-	"$Id: ttymsg.c,v 1.2 1998/03/23 07:47:31 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/wall/wall.1 b/usr.bin/wall/wall.1
index b948a7e639ae..73f928036640 100644
--- a/usr.bin/wall/wall.1
+++ b/usr.bin/wall/wall.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)wall.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt WALL 1
diff --git a/usr.bin/wall/wall.c b/usr.bin/wall/wall.c
index 288bea32c2c4..448f7a943550 100644
--- a/usr.bin/wall/wall.c
+++ b/usr.bin/wall/wall.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)wall.c	8.2 (Berkeley) 11/16/93";
 #endif
 static const char rcsid[] =
-	"$Id: wall.c,v 1.9 1997/09/15 01:03:16 ache Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1
index fec2b5f57629..86fc751fe7ac 100644
--- a/usr.bin/wc/wc.1
+++ b/usr.bin/wc/wc.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)wc.1	8.2 (Berkeley) 4/19/94
-.\"	$Id: wc.1,v 1.4 1997/02/22 19:57:44 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt WC 1
diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c
index c04a6b05c5b2..3793a905af2a 100644
--- a/usr.bin/wc/wc.c
+++ b/usr.bin/wc/wc.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)wc.c	8.1 (Berkeley) 6/6/93";
 #else
 static const char rcsid[] =
-	"$Id: wc.c,v 1.9 1999/08/06 14:37:13 sheldonh Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/what/what.1 b/usr.bin/what/what.1
index 7e369a9a0c1b..b5fe8bb05c80 100644
--- a/usr.bin/what/what.1
+++ b/usr.bin/what/what.1
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)what.1	8.1 (Berkeley) 6/6/93
 .\"
-.\" $Id: what.1,v 1.8 1998/04/14 06:31:23 phk Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt WHAT 1
diff --git a/usr.bin/what/what.c b/usr.bin/what/what.c
index ebc4d1107e9b..5a9bf35018ec 100644
--- a/usr.bin/what/what.c
+++ b/usr.bin/what/what.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)what.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: what.c,v 1.3 1997/08/25 06:49:45 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/whereis/whereis.1 b/usr.bin/whereis/whereis.1
index b569301bdf42..8e6404b4c92d 100644
--- a/usr.bin/whereis/whereis.1
+++ b/usr.bin/whereis/whereis.1
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)whereis.1	8.2 (Berkeley) 12/30/93
 .\"
-.\" $Id: whereis.1,v 1.6 1998/08/31 16:41:08 wosch Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 15, 1996
 .Dt WHEREIS 1
diff --git a/usr.bin/whereis/whereis.pl b/usr.bin/whereis/whereis.pl
index f53d2a6fb2be..1af1d4769f97 100644
--- a/usr.bin/whereis/whereis.pl
+++ b/usr.bin/whereis/whereis.pl
@@ -28,7 +28,7 @@
 #
 # Rewritten from scratch for FreeBSD after the 4.3BSD manual page.
 #
-# $Id: whereis.pl,v 1.6 1998/10/04 10:33:37 obrien Exp $
+# $FreeBSD$
 #
 
 sub usage
diff --git a/usr.bin/which/Makefile b/usr.bin/which/Makefile
index d049eee35790..94646408bc84 100644
--- a/usr.bin/which/Makefile
+++ b/usr.bin/which/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 MAINTAINER= wosch
 
diff --git a/usr.bin/which/which.1 b/usr.bin/which/which.1
index ec1d8c45a461..e9ae9d32ae70 100644
--- a/usr.bin/which/which.1
+++ b/usr.bin/which/which.1
@@ -27,7 +27,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: which.1,v 1.11 1998/05/15 11:22:42 jkoshy Exp $
+.\" $FreeBSD$
 .Dd January 26, 1995
 .Dt WHICH 1
 .Os FreeBSD
diff --git a/usr.bin/which/which.pl b/usr.bin/which/which.pl
index 55214a607558..781e1c151602 100755
--- a/usr.bin/which/which.pl
+++ b/usr.bin/which/which.pl
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $Id: which.pl,v 1.12 1998/01/02 13:46:25 helbig Exp $
+# $FreeBSD$
 
 $all = $silent = $found = 0;
 @path = split(/:/, $ENV{'PATH'});
diff --git a/usr.bin/who/who.1 b/usr.bin/who/who.1
index 1964a1a78bb5..6352eab33d8c 100644
--- a/usr.bin/who/who.1
+++ b/usr.bin/who/who.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)who.1	8.2 (Berkeley) 12/30/93
-.\"	$Id: who.1,v 1.5 1997/08/26 11:14:56 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt WHO 1
diff --git a/usr.bin/who/who.c b/usr.bin/who/who.c
index 26500ca68877..76ecdc2ae94d 100644
--- a/usr.bin/who/who.c
+++ b/usr.bin/who/who.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)who.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: who.c,v 1.6 1998/04/26 19:10:51 des Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1
index 11138392cbf7..bdb2e3b637a0 100644
--- a/usr.bin/whois/whois.1
+++ b/usr.bin/whois/whois.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)whois.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: whois.1,v 1.5 1999/02/01 19:22:27 wollman Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 1, 1999
 .Dt WHOIS 1
diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c
index 321136c6ef1c..d1a0855930ed 100644
--- a/usr.bin/whois/whois.c
+++ b/usr.bin/whois/whois.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)whois.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: whois.c,v 1.7 1999/02/01 19:22:27 wollman Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/window/window.1 b/usr.bin/window/window.1
index 6391a8e30e03..5070cfb8bb3a 100644
--- a/usr.bin/window/window.1
+++ b/usr.bin/window/window.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)window.1	8.2 (Berkeley) 12/30/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt WINDOW 1
diff --git a/usr.bin/write/write.1 b/usr.bin/write/write.1
index a5fe52d34034..2b9490209418 100644
--- a/usr.bin/write/write.1
+++ b/usr.bin/write/write.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)write.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: write.1,v 1.5 1997/03/22 17:19:32 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt WRITE 1
diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c
index f1a37fb6003a..406eeb3f7565 100644
--- a/usr.bin/write/write.c
+++ b/usr.bin/write/write.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)write.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: write.c,v 1.10 1997/09/15 00:40:34 ache Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/xargs/xargs.1 b/usr.bin/xargs/xargs.1
index b16fb8929fd7..8dec056ca98d 100644
--- a/usr.bin/xargs/xargs.1
+++ b/usr.bin/xargs/xargs.1
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)xargs.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt XARGS 1
diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c
index 41bf75a1486e..2ad94cc90926 100644
--- a/usr.bin/xargs/xargs.c
+++ b/usr.bin/xargs/xargs.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)xargs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: xargs.c,v 1.7 1998/10/13 14:52:32 des Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1
index 46f1b3b00147..46179cbf73fd 100644
--- a/usr.bin/xinstall/install.1
+++ b/usr.bin/xinstall/install.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)install.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: install.1,v 1.12 1998/06/02 12:00:08 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 22, 1996
 .Dt INSTALL 1
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index 0948040f561e..769d095624c5 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "From: @(#)xinstall.c	8.1 (Berkeley) 7/21/93";
 #endif
 static const char rcsid[] =
-	"$Id: xinstall.c,v 1.33 1998/10/13 14:52:33 des Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/xlint/lint1/Makefile b/usr.bin/xlint/lint1/Makefile
index 6ba805cb26a9..fef8dae73801 100644
--- a/usr.bin/xlint/lint1/Makefile
+++ b/usr.bin/xlint/lint1/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.3 1995/07/04 01:53:05 cgd Exp $
-#	$Id$
+# $FreeBSD$
 
 PROG=	lint1
 SRCS=	cgram.y scan.l mem1.c mem.c err.c main1.c decl.c tree.c func.c \
diff --git a/usr.bin/xlint/xlint/lint.1 b/usr.bin/xlint/xlint/lint.1
index 7b15b2c0ae15..d076b3676cc9 100644
--- a/usr.bin/xlint/xlint/lint.1
+++ b/usr.bin/xlint/xlint/lint.1
@@ -29,7 +29,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$
+.\" $FreeBSD$
 .\"
 .Dd August 28, 1994
 .Dt LINT 1
diff --git a/usr.bin/xstr/xstr.1 b/usr.bin/xstr/xstr.1
index 497965ad6cb2..777da20493b9 100644
--- a/usr.bin/xstr/xstr.1
+++ b/usr.bin/xstr/xstr.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)xstr.1	8.2 (Berkeley) 12/30/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt XSTR 1
diff --git a/usr.bin/xstr/xstr.c b/usr.bin/xstr/xstr.c
index 5820f7066913..8160bb857630 100644
--- a/usr.bin/xstr/xstr.c
+++ b/usr.bin/xstr/xstr.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)xstr.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/yacc/Makefile b/usr.bin/yacc/Makefile
index 4e4fec28da1c..3a871d989b4e 100644
--- a/usr.bin/yacc/Makefile
+++ b/usr.bin/yacc/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.3 (Berkeley) 5/12/90
-#	$Id$
+# $FreeBSD$
 
 PROG=	yacc
 SRCS=	closure.c error.c lalr.c lr0.c main.c mkpar.c output.c reader.c \
diff --git a/usr.bin/yacc/closure.c b/usr.bin/yacc/closure.c
index 82751060fbd7..4caf45857640 100644
--- a/usr.bin/yacc/closure.c
+++ b/usr.bin/yacc/closure.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/defs.h b/usr.bin/yacc/defs.h
index 612d4ee4e048..a8d8113d3165 100644
--- a/usr.bin/yacc/defs.h
+++ b/usr.bin/yacc/defs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)defs.h	5.6 (Berkeley) 5/24/93
- *	$Id: defs.h,v 1.6 1997/08/28 06:33:52 charnier Exp $
+ * $FreeBSD$
  */
 
 #include <sys/cdefs.h>	/* for __P macro */
diff --git a/usr.bin/yacc/error.c b/usr.bin/yacc/error.c
index 0e789ec69c22..3229f345104c 100644
--- a/usr.bin/yacc/error.c
+++ b/usr.bin/yacc/error.c
@@ -39,7 +39,7 @@
 static char const sccsid[] = "@(#)error.c	5.3 (Berkeley) 6/1/90";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /* routines for printing error messages  */
diff --git a/usr.bin/yacc/lalr.c b/usr.bin/yacc/lalr.c
index 275f7d1605f7..bd61e489e46b 100644
--- a/usr.bin/yacc/lalr.c
+++ b/usr.bin/yacc/lalr.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/lr0.c b/usr.bin/yacc/lr0.c
index 96d87a9714cb..07816d2ac114 100644
--- a/usr.bin/yacc/lr0.c
+++ b/usr.bin/yacc/lr0.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/main.c b/usr.bin/yacc/main.c
index 1501a592ff81..0a5511fdf568 100644
--- a/usr.bin/yacc/main.c
+++ b/usr.bin/yacc/main.c
@@ -45,7 +45,7 @@ static char const copyright[] =
 static char const sccsid[] = "@(#)main.c	5.5 (Berkeley) 5/24/93";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.8 1997/08/28 06:33:53 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <signal.h>
diff --git a/usr.bin/yacc/mkpar.c b/usr.bin/yacc/mkpar.c
index ad44c4c2b78a..e7ca1e36b91b 100644
--- a/usr.bin/yacc/mkpar.c
+++ b/usr.bin/yacc/mkpar.c
@@ -39,7 +39,7 @@
 static char const sccsid[] = "@(#)mkpar.c	5.3 (Berkeley) 1/20/91";
 #endif
 static const char rcsid[] =
-	"$Id: mkpar.c,v 1.8 1999/07/04 17:26:16 billf Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/usr.bin/yacc/output.c b/usr.bin/yacc/output.c
index 3d32c065d599..255aeea809b2 100644
--- a/usr.bin/yacc/output.c
+++ b/usr.bin/yacc/output.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: output.c,v 1.9 1997/04/29 03:05:38 steve Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/reader.c b/usr.bin/yacc/reader.c
index e0eed8d65313..4e2e588241a9 100644
--- a/usr.bin/yacc/reader.c
+++ b/usr.bin/yacc/reader.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: reader.c,v 1.6 1997/02/22 19:58:01 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/skeleton.c b/usr.bin/yacc/skeleton.c
index 28df10bab639..f3d6dd0d3630 100644
--- a/usr.bin/yacc/skeleton.c
+++ b/usr.bin/yacc/skeleton.c
@@ -56,7 +56,7 @@ char *banner[] =
 {
     "#ifndef lint",
     "static char const ",
-    "yyrcsid[] = \"$Id: skeleton.c,v 1.19 1999/07/30 06:40:00 obrien Exp $\";",
+    "yyrcsid[] = \"$FreeBSD$\";",
     "#endif",
     "#include <stdlib.h>",
     "#define YYBYACC 1",
diff --git a/usr.bin/yacc/symtab.c b/usr.bin/yacc/symtab.c
index 2f2ee2e136d1..f155021bb68e 100644
--- a/usr.bin/yacc/symtab.c
+++ b/usr.bin/yacc/symtab.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/verbose.c b/usr.bin/yacc/verbose.c
index c2cfee5d8b85..69ce15e1d271 100644
--- a/usr.bin/yacc/verbose.c
+++ b/usr.bin/yacc/verbose.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/warshall.c b/usr.bin/yacc/warshall.c
index 680363c12640..37408c0b3fa9 100644
--- a/usr.bin/yacc/warshall.c
+++ b/usr.bin/yacc/warshall.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/yacc.1 b/usr.bin/yacc/yacc.1
index f532779264ff..23a3b0d5b4a9 100644
--- a/usr.bin/yacc/yacc.1
+++ b/usr.bin/yacc/yacc.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)yacc.1	5.8 (Berkeley) 5/24/93
-.\"     $Id: yacc.1,v 1.7 1997/05/14 02:33:08 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 24, 1993
 .Dt YACC 1
diff --git a/usr.bin/yacc/yyfix.1 b/usr.bin/yacc/yyfix.1
index 7aad08e056b3..3b50a624e2d8 100644
--- a/usr.bin/yacc/yyfix.1
+++ b/usr.bin/yacc/yyfix.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)yyfix.1	5.4 (Berkeley) 3/23/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd March 23, 1993
 .Dt YYFIX 1
diff --git a/usr.bin/yes/yes.1 b/usr.bin/yes/yes.1
index 76ae9dbf0188..e19020f70aea 100644
--- a/usr.bin/yes/yes.1
+++ b/usr.bin/yes/yes.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)yes.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt YES 1
diff --git a/usr.bin/ypcat/Makefile b/usr.bin/ypcat/Makefile
index d04375c9dd7f..58ee6907f07f 100644
--- a/usr.bin/ypcat/Makefile
+++ b/usr.bin/ypcat/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-#	$Id$
+# $FreeBSD$
 
 PROG=	ypcat
 
diff --git a/usr.bin/ypcat/ypcat.1 b/usr.bin/ypcat/ypcat.1
index 605a0c3cd083..139b2c6e5799 100644
--- a/usr.bin/ypcat/ypcat.1
+++ b/usr.bin/ypcat/ypcat.1
@@ -26,7 +26,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: ypcat.1,v 1.6 1997/08/29 11:48:48 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 3, 1993
 .Dt YPCAT 1
diff --git a/usr.bin/ypcat/ypcat.c b/usr.bin/ypcat/ypcat.c
index 2604115a3881..e90e763a0349 100644
--- a/usr.bin/ypcat/ypcat.c
+++ b/usr.bin/ypcat/ypcat.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ypmatch/Makefile b/usr.bin/ypmatch/Makefile
index bdf13edac4c9..22e62996937e 100644
--- a/usr.bin/ypmatch/Makefile
+++ b/usr.bin/ypmatch/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-#	$Id$
+# $FreeBSD$
 
 PROG=	ypmatch
 
diff --git a/usr.bin/ypmatch/ypmatch.1 b/usr.bin/ypmatch/ypmatch.1
index d3cc5bf53966..6491407e942a 100644
--- a/usr.bin/ypmatch/ypmatch.1
+++ b/usr.bin/ypmatch/ypmatch.1
@@ -26,7 +26,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: ypmatch.1,v 1.6 1997/08/29 11:52:52 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 3, 1993
 .Dt YPMATCH 1
diff --git a/usr.bin/ypmatch/ypmatch.c b/usr.bin/ypmatch/ypmatch.c
index 25e4530146fa..be266bb7e1e0 100644
--- a/usr.bin/ypmatch/ypmatch.c
+++ b/usr.bin/ypmatch/ypmatch.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: ypmatch.c,v 1.5 1997/08/29 11:52:52 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ypwhich/Makefile b/usr.bin/ypwhich/Makefile
index 38d9edda0be2..f28f864ab097 100644
--- a/usr.bin/ypwhich/Makefile
+++ b/usr.bin/ypwhich/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-#	$Id: Makefile,v 1.3 1997/02/22 19:58:13 peter Exp $
+# $FreeBSD$
 
 PROG=	ypwhich
 
diff --git a/usr.bin/ypwhich/ypwhich.1 b/usr.bin/ypwhich/ypwhich.1
index d3adc258ce43..88ca36d759ba 100644
--- a/usr.bin/ypwhich/ypwhich.1
+++ b/usr.bin/ypwhich/ypwhich.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: ypwhich.1,v 1.2 1998/03/23 07:48:45 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 23, 1994
 .Dt YPWHICH 1
diff --git a/usr.bin/ypwhich/ypwhich.c b/usr.bin/ypwhich/ypwhich.c
index 763875f5e6bd..2bc9ff377dd5 100644
--- a/usr.bin/ypwhich/ypwhich.c
+++ b/usr.bin/ypwhich/ypwhich.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: ypwhich.c,v 1.9 1997/08/29 11:56:51 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>