$Id$ -> $FreeBSD$

727 files changed, 754 insertions, 753 deletions

diff --git a/etc/MAKEDEV b/etc/MAKEDEV
index b61dd165fe45..33befa4f3a92 100644
--- a/etc/MAKEDEV
+++ b/etc/MAKEDEV
@@ -132,7 +132,7 @@
 #	ipl	ipfilter control devices (ipl, ipnat, ipstate, ipauth)
 #	kbd	keyboard devices
 #
-#	$Id: MAKEDEV,v 1.207 1999/08/16 16:00:21 sheldonh Exp $
+# $FreeBSD$
 #
 
 PATH=/sbin:/bin/:/usr/bin:/usr/sbin:$PATH
diff --git a/etc/MAKEDEV.local b/etc/MAKEDEV.local
index 82f6befa1732..06cc074dc401 100644
--- a/etc/MAKEDEV.local
+++ b/etc/MAKEDEV.local
@@ -31,7 +31,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id:$
+# $FreeBSD$
 #	@(#)MAKEDEV.local	5.1 (Berkeley) 3/22/91
 #
 
diff --git a/etc/Makefile b/etc/Makefile
index f55665b59499..15d1daaf63d8 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-#	$Id: Makefile,v 1.202 1999/07/26 10:49:31 brian Exp $
+# $FreeBSD$
 
 SUBDIR=	sendmail
 
diff --git a/etc/aliases b/etc/aliases
index 2333d2827d1a..3ecde877d1dc 100644
--- a/etc/aliases
+++ b/etc/aliases
@@ -1,4 +1,4 @@
-#	$Id: aliases,v 1.8 1999/01/04 21:21:10 billf Exp $
+# $FreeBSD$
 #	@(#)aliases	5.3 (Berkeley) 5/24/90
 #
 #  Aliases in this file will NOT be expanded in the header from
diff --git a/etc/apmd.conf b/etc/apmd.conf
index d53be02e1c5f..9733eb476a92 100644
--- a/etc/apmd.conf
+++ b/etc/apmd.conf
@@ -1,6 +1,6 @@
 # apmd Configration File
 #
-#	$Id: apmd.conf,v 1.1.1 1999/07/09 01:34:57 iwasaki Exp $
+# $FreeBSD$
 #
 
 apm_event SUSPENDREQ {
diff --git a/etc/auth.conf b/etc/auth.conf
index 64b95315d2ab..afdf552cb9a3 100644
--- a/etc/auth.conf
+++ b/etc/auth.conf
@@ -1,5 +1,5 @@
 #
-# $Id: auth.conf,v 1.2 1999/01/22 15:31:25 brandon Exp $
+# $FreeBSD$
 #
 # This file contains information on what types of authentication to use.
 # It is just the beginnings of a greater scheme.
diff --git a/etc/crontab b/etc/crontab
index 21568ca77b65..affe315a9d34 100644
--- a/etc/crontab
+++ b/etc/crontab
@@ -1,6 +1,6 @@
 # /etc/crontab - root's crontab for FreeBSD
 #
-# $Id: crontab,v 1.18 1998/03/30 09:17:25 ache Exp $
+# $FreeBSD$
 #
 SHELL=/bin/sh
 PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin
diff --git a/etc/csh.cshrc b/etc/csh.cshrc
index 02aab0022171..f4f775ae6ada 100644
--- a/etc/csh.cshrc
+++ b/etc/csh.cshrc
@@ -1,3 +1,3 @@
-#	$Id:$
+# $FreeBSD$
 #
 # System-wide .cshrc file for csh(1).
diff --git a/etc/csh.login b/etc/csh.login
index cee45ec9466d..dd603492c7eb 100644
--- a/etc/csh.login
+++ b/etc/csh.login
@@ -1,4 +1,4 @@
-#	$Id:$
+# $FreeBSD$
 #
 # System-wide .login file for csh(1).
 # Uncomment this to give you the default 4.2 behavior, where disk 
diff --git a/etc/csh.logout b/etc/csh.logout
index 62725e50069d..6b0584f49984 100644
--- a/etc/csh.logout
+++ b/etc/csh.logout
@@ -1,3 +1,3 @@
-#	$Id:$
+# $FreeBSD$
 #
 # System-wide .logout file for csh(1).
diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf
index d050f0d02b2a..da9fb902f567 100644
--- a/etc/defaults/make.conf
+++ b/etc/defaults/make.conf
@@ -1,4 +1,4 @@
-# $Id: make.conf,v 1.82 1999/07/28 20:28:54 nik Exp $
+# $FreeBSD$
 #
 # This file, if present, will be read by make (see /usr/share/mk/sys.mk).
 # It allows you to override macro definitions to make without changing
diff --git a/etc/defaults/pccard.conf b/etc/defaults/pccard.conf
index 585adf2bd261..86813fef6154 100644
--- a/etc/defaults/pccard.conf
+++ b/etc/defaults/pccard.conf
@@ -8,7 +8,7 @@
 # IRQ == 0 means "allocate free IRQ from IRQ pool"
 # IRQ == 16 means "do not use IRQ (e.g. PIO mode)"
 #
-# $Id: pccard.conf.sample,v 1.38 1999/07/25 01:21:44 hosokawa Exp $
+# $FreeBSD$
 
 # Generally available IO ports
 io	0x240-0x360
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index f4f603569a21..6f5ba14b62d8 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -9,7 +9,7 @@
 #
 # All arguments must be in double or single quotes.
 #
-#	$Id: rc.conf,v 1.29 1999/08/14 17:15:19 obrien Exp $
+# $FreeBSD$
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
diff --git a/etc/dhclient.conf b/etc/dhclient.conf
index b3608a3af703..36d4e09824d7 100644
--- a/etc/dhclient.conf
+++ b/etc/dhclient.conf
@@ -1,4 +1,4 @@
-# 	$Id$
+# $FreeBSD$
 #
 #	This file is required by the ISC DHCP client.
 #	See ``man 5 dhclient.conf'' for details.
diff --git a/etc/disktab b/etc/disktab
index b5739b220520..c426b449b471 100644
--- a/etc/disktab
+++ b/etc/disktab
@@ -1,4 +1,4 @@
-#	$Id: disktab,v 1.18 1999/01/12 00:25:49 jkh Exp $
+# $FreeBSD$
 #
 # Disk geometry and partition layout tables. 
 # Key:
diff --git a/etc/dm.conf b/etc/dm.conf
index 8cf6f4653cd8..63fad93ba2ec 100644
--- a/etc/dm.conf
+++ b/etc/dm.conf
@@ -1,6 +1,6 @@
 #
 # Game Control File
-#	$Id:$
+# $FreeBSD$
 #	@(#)dm.conf	5.5 (Berkeley) 4/12/89
 #
 
diff --git a/etc/etc.alpha/MAKEDEV b/etc/etc.alpha/MAKEDEV
index 58dcbd4812a3..25101ac49371 100644
--- a/etc/etc.alpha/MAKEDEV
+++ b/etc/etc.alpha/MAKEDEV
@@ -129,7 +129,7 @@
 #	ipl	ipfilter control devices (ipl, ipnat, ipstate, ipauth)
 #	kbd	keyboard devices
 #
-#	$Id: MAKEDEV,v 1.10 1999/08/16 16:00:23 sheldonh Exp $
+# $FreeBSD$
 #	from etc.i386 MAKEDEV,v 1.199 1999/05/29 19:36:55 phk Exp
 #
 
diff --git a/etc/etc.alpha/disktab b/etc/etc.alpha/disktab
index da03c172197d..63a26e2a6890 100644
--- a/etc/etc.alpha/disktab
+++ b/etc/etc.alpha/disktab
@@ -1,4 +1,4 @@
-#	$Id: disktab,v 1.2 1998/09/02 01:34:56 brian Exp $
+# $FreeBSD$
 #
 # Disk geometry and partition layout tables. 
 # Key:
diff --git a/etc/etc.alpha/rc.alpha b/etc/etc.alpha/rc.alpha
index 26b071878e63..bcb23b8c994c 100644
--- a/etc/etc.alpha/rc.alpha
+++ b/etc/etc.alpha/rc.alpha
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.alpha,v 1.3 1999/04/24 20:58:37 peter Exp $
+# $FreeBSD$
 #	Do alpha specific processing
 #
 
diff --git a/etc/etc.alpha/ttys b/etc/etc.alpha/ttys
index 66127282f69e..86f9a398de8f 100644
--- a/etc/etc.alpha/ttys
+++ b/etc/etc.alpha/ttys
@@ -1,5 +1,5 @@
 #
-#	$Id: ttys,v 1.4 1999/02/09 23:55:04 wes Exp $
+# $FreeBSD$
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
diff --git a/etc/etc.amd64/rc.amd64 b/etc/etc.amd64/rc.amd64
index 820677979f8f..f7b22d9821de 100644
--- a/etc/etc.amd64/rc.amd64
+++ b/etc/etc.amd64/rc.amd64
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.i386,v 1.42 1999/07/12 17:20:29 iwasaki Exp $
+# $FreeBSD$
 #	Do i386 specific processing
 #
 
diff --git a/etc/etc.amd64/ttys b/etc/etc.amd64/ttys
index e23af7c51053..c38b0f0dc4b7 100644
--- a/etc/etc.amd64/ttys
+++ b/etc/etc.amd64/ttys
@@ -1,5 +1,5 @@
 #
-#	$Id: ttys,v 1.4 1999/07/04 15:06:21 des Exp $
+# $FreeBSD$
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index b61dd165fe45..33befa4f3a92 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -132,7 +132,7 @@
 #	ipl	ipfilter control devices (ipl, ipnat, ipstate, ipauth)
 #	kbd	keyboard devices
 #
-#	$Id: MAKEDEV,v 1.207 1999/08/16 16:00:21 sheldonh Exp $
+# $FreeBSD$
 #
 
 PATH=/sbin:/bin/:/usr/bin:/usr/sbin:$PATH
diff --git a/etc/etc.i386/disktab b/etc/etc.i386/disktab
index b5739b220520..c426b449b471 100644
--- a/etc/etc.i386/disktab
+++ b/etc/etc.i386/disktab
@@ -1,4 +1,4 @@
-#	$Id: disktab,v 1.18 1999/01/12 00:25:49 jkh Exp $
+# $FreeBSD$
 #
 # Disk geometry and partition layout tables. 
 # Key:
diff --git a/etc/etc.i386/rc.i386 b/etc/etc.i386/rc.i386
index 820677979f8f..f7b22d9821de 100644
--- a/etc/etc.i386/rc.i386
+++ b/etc/etc.i386/rc.i386
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.i386,v 1.42 1999/07/12 17:20:29 iwasaki Exp $
+# $FreeBSD$
 #	Do i386 specific processing
 #
 
diff --git a/etc/etc.i386/ttys b/etc/etc.i386/ttys
index e23af7c51053..c38b0f0dc4b7 100644
--- a/etc/etc.i386/ttys
+++ b/etc/etc.i386/ttys
@@ -1,5 +1,5 @@
 #
-#	$Id: ttys,v 1.4 1999/07/04 15:06:21 des Exp $
+# $FreeBSD$
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
diff --git a/etc/ftpusers b/etc/ftpusers
index 1a5bde8b9d8a..713d0bcb1709 100644
--- a/etc/ftpusers
+++ b/etc/ftpusers
@@ -1,4 +1,4 @@
-#	$Id:$
+# $FreeBSD$
 #
 # list of users disallowed any ftp access.
 # read by ftpd(8).
diff --git a/etc/gettytab b/etc/gettytab
index e9b412eefd9c..ea6180988504 100644
--- a/etc/gettytab
+++ b/etc/gettytab
@@ -1,4 +1,4 @@
-#	$Id:$
+# $FreeBSD$
 #	from: @(#)gettytab	5.14 (Berkeley) 3/27/91
 #
 # Most of the table entries here are just copies of the old getty table,
diff --git a/etc/group b/etc/group
index 6de3a75fb475..2418c29c0085 100644
--- a/etc/group
+++ b/etc/group
@@ -1,4 +1,4 @@
-#	$Id: group,v 1.17 1998/09/13 23:05:46 brian Exp $
+# $FreeBSD$
 #
 wheel:*:0:root
 daemon:*:1:daemon
diff --git a/etc/host.conf b/etc/host.conf
index 06c5d71903a8..f6d28754b5f2 100644
--- a/etc/host.conf
+++ b/etc/host.conf
@@ -1,4 +1,4 @@
-# $Id: host.conf,v 1.4 1997/02/23 09:20:40 peter Exp $
+# $FreeBSD$
 # First try the /etc/hosts file
 hosts
 # Now try the nameserver next.
diff --git a/etc/hosts b/etc/hosts
index f99bac9787e4..51e98ea93604 100644
--- a/etc/hosts
+++ b/etc/hosts
@@ -1,4 +1,4 @@
-# $Id: hosts,v 1.8 1997/02/23 09:20:41 peter Exp $
+# $FreeBSD$
 #
 # Host Database
 # This file should contain the addresses and aliases
diff --git a/etc/hosts.allow b/etc/hosts.allow
index 36d6d8009edd..d8645a5673c9 100644
--- a/etc/hosts.allow
+++ b/etc/hosts.allow
@@ -1,6 +1,6 @@
 #
 # hosts.allow access control file for "tcp wrapped" apps.
-# $Id: hosts.allow,v 1.3 1999/05/08 02:19:25 obrien Exp $
+# $FreeBSD$
 #
 # NOTE: The hosts.deny file is not longer used.  Instead, put both 'allow'
 #       and 'deny' rules in the hosts.allow file.
diff --git a/etc/hosts.equiv b/etc/hosts.equiv
index 9ca200b1c197..d8a71c1ebc7f 100644
--- a/etc/hosts.equiv
+++ b/etc/hosts.equiv
@@ -1,4 +1,4 @@
-#	$Id:$
+# $FreeBSD$
 #
 #localhost
 #my_very_good_friend.domain
diff --git a/etc/hosts.lpd b/etc/hosts.lpd
index c16300ef6a10..b53202ab18e5 100644
--- a/etc/hosts.lpd
+++ b/etc/hosts.lpd
@@ -1,4 +1,4 @@
-#	$Id:$
+# $FreeBSD$
 #
 # See lpd(8)
 #machine.domain
diff --git a/etc/inetd.conf b/etc/inetd.conf
index 510a76c7a309..1fd42462dcd3 100644
--- a/etc/inetd.conf
+++ b/etc/inetd.conf
@@ -1,4 +1,4 @@
-#	$Id: inetd.conf,v 1.38 1999/07/23 15:49:31 sheldonh Exp $
+# $FreeBSD$
 #
 # Internet server configuration database
 #
diff --git a/etc/isdn/Makefile b/etc/isdn/Makefile
index e5f52307a7eb..7e4cd556bbad 100644
--- a/etc/isdn/Makefile
+++ b/etc/isdn/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1999/01/19 15:33:15 hm Exp $
+# $FreeBSD$
 
 I4BETCPROG=	answer		\
 		isdntel.sh	\
diff --git a/etc/isdn/answer b/etc/isdn/answer
index 4a023cb3e71c..df9e8041de70 100755
--- a/etc/isdn/answer
+++ b/etc/isdn/answer
@@ -4,7 +4,7 @@
 #	answer script for i4b isdnd
 #	---------------------------
 #
-#	$Id: answer,v 1.5 1999/04/23 09:42:05 hm Exp $
+# $FreeBSD$
 #
 #	last edit-date: [Thu May 20 11:44:38 1999]
 #
diff --git a/etc/isdn/isdnd.rates.D b/etc/isdn/isdnd.rates.D
index 447d5fc8cf0c..430f9dafc2a9 100644
--- a/etc/isdn/isdnd.rates.D
+++ b/etc/isdn/isdnd.rates.D
@@ -3,7 +3,7 @@
 #	i4b - Deutsche Telekom charging rates config file
 #	-------------------------------------------------
 #
-#	$Id: isdnd.rates.D,v 1.5 1999/01/17 17:40:33 hm Exp $
+# $FreeBSD$
 #
 #	last edit-date: [Sun Jan 17 18:38:29 1999]
 #
diff --git a/etc/isdn/isdnd.rates.F b/etc/isdn/isdnd.rates.F
index 6dc32f5fc0f3..14d772df6630 100644
--- a/etc/isdn/isdnd.rates.F
+++ b/etc/isdn/isdnd.rates.F
@@ -3,7 +3,7 @@
 #	i4b - Tarifs France Telecom
 #	---------------------------
 #
-#	$Id: isdnd.rates.F,v 1.1 1998/03/19 19:09:28 hm Exp $
+# $FreeBSD$
 #
 #	last edit-date: [Thu Mar 19 20:05:18 1998]
 #
diff --git a/etc/isdn/isdnd.rc.sample b/etc/isdn/isdnd.rc.sample
index 17987be350d5..6681ed3bc2e7 100644
--- a/etc/isdn/isdnd.rc.sample
+++ b/etc/isdn/isdnd.rc.sample
@@ -3,7 +3,7 @@
 #	example of a configuration file for the isdn daemon
 #	---------------------------------------------------
 #
-#	$Id: isdnd.rc,v 1.1 1999/01/10 14:30:47 hm Exp $
+# $FreeBSD$
 #
 #	last edit-date: [Tue Jan 19 16:30:12 1999]
 #
diff --git a/etc/isdn/isdntel.alias.sample b/etc/isdn/isdntel.alias.sample
index a6e42e4fd019..c06bc1942a08 100644
--- a/etc/isdn/isdntel.alias.sample
+++ b/etc/isdn/isdntel.alias.sample
@@ -3,7 +3,7 @@
 #	alias file for the isdntel(1) application
 #	-----------------------------------------
 #
-#	$Id: isdntel.alias,v 1.1 1999/01/10 14:30:48 hm Exp $
+# $FreeBSD$
 #
 #	last edit-date: [Fri Dec 18 18:06:03 1998]
 #
diff --git a/etc/isdn/isdntel.sh b/etc/isdn/isdntel.sh
index 376434eeae9d..d76885de7fd8 100755
--- a/etc/isdn/isdntel.sh
+++ b/etc/isdn/isdntel.sh
@@ -4,7 +4,7 @@
 #	isdn telephone answering
 #	-------------------------
 #
-#	$Id: isdntel.sh,v 1.9 1999/04/23 09:42:05 hm Exp $
+# $FreeBSD$
 #
 #	last edit-date: [Thu May 20 11:45:04 1999]
 #
diff --git a/etc/isdn/record b/etc/isdn/record
index f60a7c21a1b9..24e6cd6f043f 100755
--- a/etc/isdn/record
+++ b/etc/isdn/record
@@ -4,7 +4,7 @@
 #	answer and record message script for i4b isdnd
 #	----------------------------------------------
 #
-#	$Id: record,v 1.5 1999/04/23 09:42:05 hm Exp $
+# $FreeBSD$
 #
 #	last edit-date: [Thu May 20 11:45:10 1999]
 #
diff --git a/etc/isdn/tell b/etc/isdn/tell
index 12b4af2a181b..7bdd10a16287 100755
--- a/etc/isdn/tell
+++ b/etc/isdn/tell
@@ -4,7 +4,7 @@
 #	tell called and calling numbers answer script for i4b isdnd
 #	-----------------------------------------------------------
 #
-#	$Id: tell,v 1.5 1999/04/23 09:42:05 hm Exp $
+# $FreeBSD$
 #
 #	last edit-date: [Thu May 20 11:45:15 1999]
 #
diff --git a/etc/isdn/tell-record b/etc/isdn/tell-record
index ba02145a1b34..d5c356c351a8 100755
--- a/etc/isdn/tell-record
+++ b/etc/isdn/tell-record
@@ -4,7 +4,7 @@
 #	tell called and calling numbers answer script for i4b isdnd
 #	-----------------------------------------------------------
 #
-#	$Id: tell-record,v 1.5 1999/04/23 09:42:05 hm Exp $
+# $FreeBSD$
 #
 #	last edit-date: [Thu May 20 11:45:21 1999]
 #
diff --git a/etc/kerberosIV/README b/etc/kerberosIV/README
index a0a4b8055434..cdec6b120d36 100644
--- a/etc/kerberosIV/README
+++ b/etc/kerberosIV/README
@@ -1,4 +1,4 @@
-#	$Id:$
+# $FreeBSD$
 #	@(#)README	5.1 (Berkeley) 6/30/90
 
 Notes about the contents of the /etc/kerberosIV directory:
diff --git a/etc/login.access b/etc/login.access
index 0e3f26662fd9..8d20467d02e0 100644
--- a/etc/login.access
+++ b/etc/login.access
@@ -1,4 +1,4 @@
-#	$Id:$
+# $FreeBSD$
 #
 # Login access control table.
 # 
diff --git a/etc/login.conf b/etc/login.conf
index 2efc4d0cf046..bae181c50657 100644
--- a/etc/login.conf
+++ b/etc/login.conf
@@ -9,7 +9,7 @@
 # This file controls resource limits, accounting limits and
 # default user environment settings.
 #
-#	$Id: login.conf,v 1.32 1999/07/14 22:36:10 nik Exp $
+# $FreeBSD$
 #
 
 # Default settings effectively disable resource limits, see the
diff --git a/etc/mail/Makefile b/etc/mail/Makefile
index cf6e559c2c52..fbce06e39869 100644
--- a/etc/mail/Makefile
+++ b/etc/mail/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.6 1999/01/31 15:21:15 jmb Exp $
+# $FreeBSD$
 
 install:
 	/usr/sbin/makemap hash /etc/mail/access < /etc/mail/access.txt
diff --git a/etc/mail/README b/etc/mail/README
index 05992c753daa..60f473e1765f 100644
--- a/etc/mail/README
+++ b/etc/mail/README
@@ -1,4 +1,4 @@
-#	$Id: README,v 1.5.2.1 1999/05/01 03:37:29 jkh Exp $
+# $FreeBSD$
 
 		Filtering out SPAM from your site
         Sendmail now includes excellent tools block spam.  These
diff --git a/etc/mail/aliases b/etc/mail/aliases
index 2333d2827d1a..3ecde877d1dc 100644
--- a/etc/mail/aliases
+++ b/etc/mail/aliases
@@ -1,4 +1,4 @@
-#	$Id: aliases,v 1.8 1999/01/04 21:21:10 billf Exp $
+# $FreeBSD$
 #	@(#)aliases	5.3 (Berkeley) 5/24/90
 #
 #  Aliases in this file will NOT be expanded in the header from
diff --git a/etc/make.conf b/etc/make.conf
index d050f0d02b2a..da9fb902f567 100644
--- a/etc/make.conf
+++ b/etc/make.conf
@@ -1,4 +1,4 @@
-# $Id: make.conf,v 1.82 1999/07/28 20:28:54 nik Exp $
+# $FreeBSD$
 #
 # This file, if present, will be read by make (see /usr/share/mk/sys.mk).
 # It allows you to override macro definitions to make without changing
diff --git a/etc/modems b/etc/modems
index 4626598f7b8f..422c5ffd32e0 100644
--- a/etc/modems
+++ b/etc/modems
@@ -1,5 +1,5 @@
 #
-#	$Id:$
+# $FreeBSD$
 #	@(#)modems	3/24/95
 #
 # modems -- modem configuration data base file
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index e6758195f7b5..6ecdae40c032 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -1,4 +1,4 @@
-#	$Id: BSD.include.dist,v 1.24 1998/12/13 04:38:28 dillon Exp $
+# $FreeBSD$
 #
 # Please see the file README before making changes to this file.
 #
diff --git a/etc/mtree/BSD.local.dist b/etc/mtree/BSD.local.dist
index fd587bba7194..380dde571049 100644
--- a/etc/mtree/BSD.local.dist
+++ b/etc/mtree/BSD.local.dist
@@ -1,4 +1,4 @@
-#	$Id: BSD.local.dist,v 1.47 1999/08/23 05:12:40 rgrimes Exp $
+# $FreeBSD$
 #
 # Please see the file README before making changes to this file.
 #
diff --git a/etc/mtree/BSD.release.dist b/etc/mtree/BSD.release.dist
index b0fa09e8d30c..af67f211f331 100644
--- a/etc/mtree/BSD.release.dist
+++ b/etc/mtree/BSD.release.dist
@@ -1,4 +1,4 @@
-#	$Id: BSD.release.dist,v 1.4 1997/02/23 09:21:05 peter Exp $
+# $FreeBSD$
 #
 # Please see the file README before making changes to this file.
 #
diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index 96b5a2362afa..db2ec0b8f2a1 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -1,4 +1,4 @@
-#	$Id: BSD.root.dist,v 1.41 1999/08/23 05:12:42 rgrimes Exp $
+# $FreeBSD$
 #
 # Please see the file README before making changes to this file.
 #
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 66abb24b3099..7f7012871bfe 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -1,4 +1,4 @@
-#	$Id: BSD.usr.dist,v 1.163 1999/08/25 21:49:37 rgrimes Exp $
+# $FreeBSD$
 #
 # Please see the file README before making changes to this file.
 #
diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
index 495cdff007e7..78bfd857f63c 100644
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist
@@ -1,4 +1,4 @@
-#	$Id: BSD.var.dist,v 1.41 1999/08/23 05:12:42 rgrimes Exp $
+# $FreeBSD$
 #
 # Please see the file README before making changes to this file.
 #
diff --git a/etc/mtree/BSD.x11-4.dist b/etc/mtree/BSD.x11-4.dist
index a5fef7b80bfd..1aaf3f6c0ebf 100644
--- a/etc/mtree/BSD.x11-4.dist
+++ b/etc/mtree/BSD.x11-4.dist
@@ -1,4 +1,4 @@
-#	$Id: BSD.x11.dist,v 1.5 1999/08/23 05:12:43 rgrimes Exp $
+# $FreeBSD$
 #
 # Please see the file README before making changes to this file.
 #
diff --git a/etc/mtree/BSD.x11.dist b/etc/mtree/BSD.x11.dist
index a5fef7b80bfd..1aaf3f6c0ebf 100644
--- a/etc/mtree/BSD.x11.dist
+++ b/etc/mtree/BSD.x11.dist
@@ -1,4 +1,4 @@
-#	$Id: BSD.x11.dist,v 1.5 1999/08/23 05:12:43 rgrimes Exp $
+# $FreeBSD$
 #
 # Please see the file README before making changes to this file.
 #
diff --git a/etc/mtree/README b/etc/mtree/README
index bafa838d5f9d..00b6c47e28da 100644
--- a/etc/mtree/README
+++ b/etc/mtree/README
@@ -1,4 +1,4 @@
-$Id: README,v 1.1 1999/08/23 01:16:26 rgrimes Exp $
+$FreeBSD$
 
 These files are used to create empty file hierarchies for building the
 system into.  Some notes about working with them are placed here to try
diff --git a/etc/namedb/PROTO.localhost.rev b/etc/namedb/PROTO.localhost.rev
index 4981ed04f014..5b293106348b 100644
--- a/etc/namedb/PROTO.localhost.rev
+++ b/etc/namedb/PROTO.localhost.rev
@@ -1,5 +1,5 @@
 ;	From: @(#)localhost.rev	5.1 (Berkeley) 6/30/90
-;	$Id: PROTO.localhost.rev,v 1.3 1997/02/23 09:21:09 peter Exp $
+; $FreeBSD$
 ;
 ; This file is automatically edited by the `make-localhost' script in
 ; the /etc/namedb directory.
diff --git a/etc/namedb/make-localhost b/etc/namedb/make-localhost
index b04deaaebbb2..cc6a1083f4d0 100755
--- a/etc/namedb/make-localhost
+++ b/etc/namedb/make-localhost
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$Id:$
+# $FreeBSD$
 #
 # make-localhost - edit the appropriate local information into
 # /etc/namedb/localhost.rev
diff --git a/etc/namedb/named.conf b/etc/namedb/named.conf
index ee22c00eca40..9ba5f51b2c73 100644
--- a/etc/namedb/named.conf
+++ b/etc/namedb/named.conf
@@ -1,4 +1,4 @@
-// $Id: named.conf,v 1.4 1998/12/02 19:59:24 dillon Exp $
+// $FreeBSD$
 //
 // Refer to the named(8) man page for details.  If you are ever going
 // to setup a primary server, make sure you've understood the hairy
diff --git a/etc/netstart b/etc/netstart
index 6a101ba33a3a..21e67edc9546 100755
--- a/etc/netstart
+++ b/etc/netstart
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: netstart,v 1.52 1997/07/05 19:35:45 pst Exp $
+# $FreeBSD$
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # This file is NOT called by any of the other scripts - it has been
diff --git a/etc/network.subr b/etc/network.subr
index 40cfcad87f27..9c5f4aaab133 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.56 1999/08/25 16:01:37 sheldonh Exp $
+# $FreeBSD$
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
diff --git a/etc/networks b/etc/networks
index 1f9ed30e7e73..a6b15d4519b7 100644
--- a/etc/networks
+++ b/etc/networks
@@ -1,4 +1,4 @@
-#	$Id:$
+# $FreeBSD$
 #	@(#)networks	5.1 (Berkeley) 6/30/90
 #
 # Your Local Networks Database
diff --git a/etc/newsyslog.conf b/etc/newsyslog.conf
index 0f2f195a8b2f..e8550a413382 100644
--- a/etc/newsyslog.conf
+++ b/etc/newsyslog.conf
@@ -1,5 +1,5 @@
 # configuration file for newsyslog
-# $Id: newsyslog.conf,v 1.21 1999/06/28 03:14:58 obrien Exp $
+# $FreeBSD$
 #
 # logfilename          [owner:group]    mode count size when [ZB] [/pid_file] [sig_num]
 /var/cron/log				600  3	   100  *     Z
diff --git a/etc/pccard.conf.sample b/etc/pccard.conf.sample
index 585adf2bd261..86813fef6154 100644
--- a/etc/pccard.conf.sample
+++ b/etc/pccard.conf.sample
@@ -8,7 +8,7 @@
 # IRQ == 0 means "allocate free IRQ from IRQ pool"
 # IRQ == 16 means "do not use IRQ (e.g. PIO mode)"
 #
-# $Id: pccard.conf.sample,v 1.38 1999/07/25 01:21:44 hosokawa Exp $
+# $FreeBSD$
 
 # Generally available IO ports
 io	0x240-0x360
diff --git a/etc/pccard_ether b/etc/pccard_ether
index 3f6ab7f2110c..e5d3ce1ff0d4 100755
--- a/etc/pccard_ether
+++ b/etc/pccard_ether
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: pccard_ether,v 1.11 1999/02/22 02:55:18 steve Exp $
+# $FreeBSD$
 #
 # pccard_ether interfacename [ifconfig option]
 #
diff --git a/etc/periodic/Makefile b/etc/periodic/Makefile
index 6317cdb63d36..4c1fda48ae91 100644
--- a/etc/periodic/Makefile
+++ b/etc/periodic/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1997/08/12 18:23:24 pst Exp $
+# $FreeBSD$
 
 SUBDIR=	daily weekly monthly
 
diff --git a/etc/periodic/Makefile.inc b/etc/periodic/Makefile.inc
index c680f695db66..aba831316adf 100644
--- a/etc/periodic/Makefile.inc
+++ b/etc/periodic/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.2 1998/05/31 11:38:25 bde Exp $
+# $FreeBSD$
 
 BINDIR=	/etc/periodic/${.CURDIR:T}
 NOOBJ=
diff --git a/etc/periodic/daily/100.clean-disks b/etc/periodic/daily/100.clean-disks
index 6903894be905..e6b744aa89ec 100755
--- a/etc/periodic/daily/100.clean-disks
+++ b/etc/periodic/daily/100.clean-disks
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: 100.clean-disks,v 1.1.1.1 1997/08/16 17:04:00 pst Exp $
+# $FreeBSD$
 #
 
 exit 0		# do not run by default
diff --git a/etc/periodic/daily/110.clean-tmps b/etc/periodic/daily/110.clean-tmps
index 2b1e9efdd321..78d817eeba72 100755
--- a/etc/periodic/daily/110.clean-tmps
+++ b/etc/periodic/daily/110.clean-tmps
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: 110.clean-tmps,v 1.4 1999/03/21 12:33:54 joerg Exp $
+# $FreeBSD$
 #
 # Use at your own risk, but for a long-living system, this might come
 # more useful than the boot-time cleaning of /tmp.  If /var/tmp and
diff --git a/etc/periodic/daily/120.clean-preserve b/etc/periodic/daily/120.clean-preserve
index a780f6f20fbf..37278c10556e 100755
--- a/etc/periodic/daily/120.clean-preserve
+++ b/etc/periodic/daily/120.clean-preserve
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: 120.clean-preserve,v 1.2 1997/08/17 17:55:29 pst Exp $
+# $FreeBSD$
 #
 
 if [ -d /var/preserve ]; then
diff --git a/etc/periodic/daily/130.clean-msgs b/etc/periodic/daily/130.clean-msgs
index fc12425fc911..066581bf7748 100755
--- a/etc/periodic/daily/130.clean-msgs
+++ b/etc/periodic/daily/130.clean-msgs
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: 130.clean-msgs,v 1.1.1.1 1997/08/16 17:04:00 pst Exp $
+# $FreeBSD$
 #
 # remove system	messages older than 21 days
 #
diff --git a/etc/periodic/daily/140.clean-rwho b/etc/periodic/daily/140.clean-rwho
index b89a7c26ba50..71ac4ae3fe79 100755
--- a/etc/periodic/daily/140.clean-rwho
+++ b/etc/periodic/daily/140.clean-rwho
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: 140.clean-rwho,v 1.2 1997/08/17 17:55:30 pst Exp $
+# $FreeBSD$
 #
 
 if [ -d /var/rwho ] ; then
diff --git a/etc/periodic/daily/150.clean-hoststat b/etc/periodic/daily/150.clean-hoststat
index 93e1f5ab7ce7..b335eb429bee 100755
--- a/etc/periodic/daily/150.clean-hoststat
+++ b/etc/periodic/daily/150.clean-hoststat
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: 150.clean-hoststat,v 1.1 1999/03/30 15:30:44 wollman Exp $
+# $FreeBSD$
 #
 
 if [ -d /var/spool/.hoststat ] ; then
diff --git a/etc/periodic/daily/200.backup-passwd b/etc/periodic/daily/200.backup-passwd
index f699399b245b..43b12a88582e 100755
--- a/etc/periodic/daily/200.backup-passwd
+++ b/etc/periodic/daily/200.backup-passwd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: 200.backup-passwd,v 1.1.1.1 1997/08/16 17:04:00 pst Exp $
+# $FreeBSD$
 #
 bak=/var/backups
 
diff --git a/etc/periodic/daily/210.backup-aliases b/etc/periodic/daily/210.backup-aliases
index 5e21bb40be22..043c4f51098d 100755
--- a/etc/periodic/daily/210.backup-aliases
+++ b/etc/periodic/daily/210.backup-aliases
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: 210.backup-aliases,v 1.1.1.1 1997/08/12 17:51:16 pst Exp $
+# $FreeBSD$
 #
 bak=/var/backups
 
diff --git a/etc/periodic/daily/220.backup-distfile b/etc/periodic/daily/220.backup-distfile
index 96a0529f91ee..16a0541570a2 100755
--- a/etc/periodic/daily/220.backup-distfile
+++ b/etc/periodic/daily/220.backup-distfile
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: 220.backup-distfile,v 1.1.1.1 1997/08/16 17:04:00 pst Exp $
+# $FreeBSD$
 #
 bak=/var/backups
 
diff --git a/etc/periodic/daily/300.calendar b/etc/periodic/daily/300.calendar
index d7cdac4484c2..de0aeec71348 100755
--- a/etc/periodic/daily/300.calendar
+++ b/etc/periodic/daily/300.calendar
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: 300.calendar,v 1.1.1.1 1997/08/16 17:04:00 pst Exp $
+# $FreeBSD$
 #
 # `calendar -a' needs to die. Why? Because it's a bad idea, particular
 # with networked home directories, but also in general.  If you want the
diff --git a/etc/periodic/daily/310.accounting b/etc/periodic/daily/310.accounting
index 4f437a8fd492..f713920fe2a3 100755
--- a/etc/periodic/daily/310.accounting
+++ b/etc/periodic/daily/310.accounting
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: 310.accounting,v 1.1.1.1 1997/08/16 17:04:00 pst Exp $
+# $FreeBSD$
 #
 
 if [ -f /var/account/acct ] ; then
diff --git a/etc/periodic/daily/320.rdist b/etc/periodic/daily/320.rdist
index 6299d8a1d417..267315271706 100755
--- a/etc/periodic/daily/320.rdist
+++ b/etc/periodic/daily/320.rdist
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: 320.rdist,v 1.1.1.1 1997/08/16 17:04:00 pst Exp $
+# $FreeBSD$
 #
 
 if [ -f /etc/Distfile ]; then
diff --git a/etc/periodic/daily/330.news b/etc/periodic/daily/330.news
index 2cb3ff958bc6..b7be359d29b0 100755
--- a/etc/periodic/daily/330.news
+++ b/etc/periodic/daily/330.news
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: 330.news,v 1.1.1.1 1997/08/12 17:51:15 pst Exp $
+# $FreeBSD$
 #
 # Expire news articles
 # (This is present only for backwards compatibility, usually the news
diff --git a/etc/periodic/daily/340.uucp b/etc/periodic/daily/340.uucp
index e83e2b0aa265..3ee830440f51 100755
--- a/etc/periodic/daily/340.uucp
+++ b/etc/periodic/daily/340.uucp
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: 340.uucp,v 1.2 1997/08/17 17:55:32 pst Exp $
+# $FreeBSD$
 #
 # Local cleanup of UUCP files.  This is for backwards compatibility,
 # /etc/uuclean.daily doesn't exist by default.
diff --git a/etc/periodic/daily/400.status-disks b/etc/periodic/daily/400.status-disks
index b7a12d3841e5..86113183108e 100755
--- a/etc/periodic/daily/400.status-disks
+++ b/etc/periodic/daily/400.status-disks
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: 400.status-disks,v 1.1.1.1 1997/08/12 17:51:15 pst Exp $
+# $FreeBSD$
 #
 
 echo ""
diff --git a/etc/periodic/daily/410.status-uucp b/etc/periodic/daily/410.status-uucp
index ac21f6f9a9e5..af8a8f6d3127 100755
--- a/etc/periodic/daily/410.status-uucp
+++ b/etc/periodic/daily/410.status-uucp
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: 410.status-uucp,v 1.1.1.1 1997/08/16 17:04:01 pst Exp $
+# $FreeBSD$
 #
 
 if [ -d /var/spool/uucp -a -x /usr/bin/uustat ]; then
diff --git a/etc/periodic/daily/420.status-network b/etc/periodic/daily/420.status-network
index b22d0a48240d..0d47661f4c17 100755
--- a/etc/periodic/daily/420.status-network
+++ b/etc/periodic/daily/420.status-network
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: 420.status-network,v 1.1.1.1 1997/08/16 17:04:01 pst Exp $
+# $FreeBSD$
 #
 
 if [ -x /usr/bin/netstat ] ; then
diff --git a/etc/periodic/daily/430.status-rwho b/etc/periodic/daily/430.status-rwho
index c40efaafa5f3..151898d4646b 100755
--- a/etc/periodic/daily/430.status-rwho
+++ b/etc/periodic/daily/430.status-rwho
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: 430.status-rwho,v 1.1.1.1 1997/08/16 17:04:01 pst Exp $
+# $FreeBSD$
 #
 
 if [ -d /var/rwho -a -x /usr/bin/rwho -a $(ls -l /var/rwho | wc -l) -ne 0 ]
diff --git a/etc/periodic/daily/440.status-mailq b/etc/periodic/daily/440.status-mailq
index 5f3ca3fdc3fb..a9336fcf4c12 100755
--- a/etc/periodic/daily/440.status-mailq
+++ b/etc/periodic/daily/440.status-mailq
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: 440.status-mailq,v 1.2 1998/01/18 22:28:06 wosch Exp $
+# $FreeBSD$
 #
 if [ -x /usr/bin/mailq -a -d /var/spool/mqueue ] ; then
     echo ""
diff --git a/etc/periodic/daily/450.status-security b/etc/periodic/daily/450.status-security
index 7eca5073d826..92f328d4893b 100755
--- a/etc/periodic/daily/450.status-security
+++ b/etc/periodic/daily/450.status-security
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: 450.status-security,v 1.1.1.1 1997/08/16 17:04:01 pst Exp $
+# $FreeBSD$
 #
 
 if [ -f /etc/security -a -x /usr/sbin/sendmail ] ; then
diff --git a/etc/periodic/daily/460.status-mail-rejects b/etc/periodic/daily/460.status-mail-rejects
index 636d3c48bf9f..4a29b47bf638 100755
--- a/etc/periodic/daily/460.status-mail-rejects
+++ b/etc/periodic/daily/460.status-mail-rejects
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: 460.status-mail-rejects,v 1.6 1998/02/05 15:38:17 wosch Exp $
+# $FreeBSD$
 #
 
 if [ -d /etc/mail -a -f /var/log/maillog ]; then
diff --git a/etc/periodic/daily/999.local b/etc/periodic/daily/999.local
index 8a48c61284c8..2f715abb595e 100755
--- a/etc/periodic/daily/999.local
+++ b/etc/periodic/daily/999.local
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: 999.local,v 1.1.1.1 1997/08/12 17:51:16 pst Exp $
+# $FreeBSD$
 #
 # Run the old /etc/daily.local script.  This is really for backwards
 # compatibility more than anything else.
diff --git a/etc/periodic/daily/Makefile b/etc/periodic/daily/Makefile
index 456faab10b2c..1944e5efcbdf 100644
--- a/etc/periodic/daily/Makefile
+++ b/etc/periodic/daily/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1.1.1 1997/08/16 17:04:01 pst Exp $
+# $FreeBSD$
 
 BIN=    100.clean-disks \
 	110.clean-tmps \
diff --git a/etc/periodic/monthly/200.accounting b/etc/periodic/monthly/200.accounting
index 8cd532f2655f..fff47bfbfc83 100755
--- a/etc/periodic/monthly/200.accounting
+++ b/etc/periodic/monthly/200.accounting
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $Id: 200.accounting,v 1.2 1998/02/09 11:36:43 danny Exp $
+# $FreeBSD$
 #
 
 W=/var/log/wtmp
diff --git a/etc/periodic/monthly/999.local b/etc/periodic/monthly/999.local
index 9eec52bec041..75fbebdb169a 100755
--- a/etc/periodic/monthly/999.local
+++ b/etc/periodic/monthly/999.local
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $Id: 999.local,v 1.1 1997/08/12 18:23:27 pst Exp $
+# $FreeBSD$
 #
 if [ -f /etc/monthly.local ]; then
     echo ""
diff --git a/etc/periodic/monthly/Makefile b/etc/periodic/monthly/Makefile
index e73251b7ae45..6fea21cf5eda 100644
--- a/etc/periodic/monthly/Makefile
+++ b/etc/periodic/monthly/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1997/08/12 18:23:28 pst Exp $
+# $FreeBSD$
 
 BIN=	200.accounting \
 	999.local
diff --git a/etc/periodic/weekly/120.clean-kvmdb b/etc/periodic/weekly/120.clean-kvmdb
index abf00cd8f016..42079c28089d 100755
--- a/etc/periodic/weekly/120.clean-kvmdb
+++ b/etc/periodic/weekly/120.clean-kvmdb
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $Id: 120.clean-kvmdb,v 1.2 1998/01/01 09:04:47 bde Exp $
+# $FreeBSD$
 #
 
 if [ -d /var/db ] ; then
diff --git a/etc/periodic/weekly/300.uucp b/etc/periodic/weekly/300.uucp
index a434f07e4183..eb915044d32b 100755
--- a/etc/periodic/weekly/300.uucp
+++ b/etc/periodic/weekly/300.uucp
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $Id: 300.uucp,v 1.1.1.1 1997/08/16 17:04:02 pst Exp $
+# $FreeBSD$
 #
 # This is really here for backwards compatibility, clean.weekly is not
 # created by default anymore.
diff --git a/etc/periodic/weekly/310.locate b/etc/periodic/weekly/310.locate
index f55d2ed9280e..b616a4ab4573 100755
--- a/etc/periodic/weekly/310.locate
+++ b/etc/periodic/weekly/310.locate
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $Id: 310.locate,v 1.2 1997/11/01 15:00:40 wosch Exp $
+# $FreeBSD$
 #
 locdb=/var/db/locate.database
 
diff --git a/etc/periodic/weekly/320.whatis b/etc/periodic/weekly/320.whatis
index fc91e7f20813..bf159a8b472e 100755
--- a/etc/periodic/weekly/320.whatis
+++ b/etc/periodic/weekly/320.whatis
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $Id: 320.whatis,v 1.1.1.1 1997/08/16 17:04:02 pst Exp $
+# $FreeBSD$
 #
 
 if [ -x /usr/libexec/makewhatis.local -a -x /usr/bin/manpath ] ; then
diff --git a/etc/periodic/weekly/330.catman b/etc/periodic/weekly/330.catman
index 0444ada068fe..5a4f490d96c5 100755
--- a/etc/periodic/weekly/330.catman
+++ b/etc/periodic/weekly/330.catman
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $Id: 330.catman,v 1.1.1.1 1997/08/16 17:04:02 pst Exp $
+# $FreeBSD$
 #
 
 exit 0		# do not run by default
diff --git a/etc/periodic/weekly/340.noid b/etc/periodic/weekly/340.noid
index 4848ee3aabfe..8a94924b6703 100644
--- a/etc/periodic/weekly/340.noid
+++ b/etc/periodic/weekly/340.noid
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $Id$
+# $FreeBSD$
 
 exit 0		# do not run by default
 
diff --git a/etc/periodic/weekly/999.local b/etc/periodic/weekly/999.local
index 662750865611..bc9fac288c04 100755
--- a/etc/periodic/weekly/999.local
+++ b/etc/periodic/weekly/999.local
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $Id: 999.local,v 1.1.1.1 1997/08/16 17:04:02 pst Exp $
+# $FreeBSD$
 #
 
 if [ -f /etc/weekly.local ]; then
diff --git a/etc/periodic/weekly/Makefile b/etc/periodic/weekly/Makefile
index 2c3d1c6b295f..33e4086f1657 100644
--- a/etc/periodic/weekly/Makefile
+++ b/etc/periodic/weekly/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1997/08/18 16:49:40 pst Exp $
+# $FreeBSD$
 
 BIN=	120.clean-kvmdb \
 	300.uucp \
diff --git a/etc/phones b/etc/phones
index 0bbf524858c0..536ac2019597 100644
--- a/etc/phones
+++ b/etc/phones
@@ -1,4 +1,4 @@
-#	$Id: phones,v 1.6 1997/02/23 09:20:43 peter Exp $
+# $FreeBSD$
 #	From: @(#)phones	5.2 (Berkeley) 6/30/90
 #
 # phones -- remote host phone number data base
diff --git a/etc/ppp/ppp.conf b/etc/ppp/ppp.conf
index 63ddd335455a..410db1a55bc7 100644
--- a/etc/ppp/ppp.conf
+++ b/etc/ppp/ppp.conf
@@ -3,7 +3,7 @@
 # Originally written by Toshiharu OHNO
 # Simplified 5/14/1999 by wself@cdrom.com
 #
-# $Id$
+# $FreeBSD$
 #################################################################
 
 default:
diff --git a/etc/ppp/ppp.deny b/etc/ppp/ppp.deny
index f1d7c834572d..6d06f4fac32e 100644
--- a/etc/ppp/ppp.deny
+++ b/etc/ppp/ppp.deny
@@ -1,4 +1,4 @@
-#	$Id:$
+# $FreeBSD$
 #
 # list of users disallowed any pppd access via 'system
 # password login'.
diff --git a/etc/ppp/ppp.shells.sample b/etc/ppp/ppp.shells.sample
index 4c5149e785a9..7d26d62a5054 100644
--- a/etc/ppp/ppp.shells.sample
+++ b/etc/ppp/ppp.shells.sample
@@ -1,4 +1,4 @@
-#	$Id:$
+# $FreeBSD$
 #
 # List of acceptable shells for pppd(8).
 # Pppd will not accept a system password login
diff --git a/etc/printcap b/etc/printcap
index 50080719a268..81c3a5e541b0 100644
--- a/etc/printcap
+++ b/etc/printcap
@@ -1,5 +1,5 @@
 #	@(#)printcap	5.3 (Berkeley) 6/30/90
-# $Id: printcap,v 1.8 1998/01/04 17:59:24 steve Exp $
+# $FreeBSD$
 
 #
 # This enables a simple local "raw" printer, hooked up to the first
diff --git a/etc/profile b/etc/profile
index ab7d6e69995b..76958757b099 100644
--- a/etc/profile
+++ b/etc/profile
@@ -1,4 +1,4 @@
-#	$Id:$
+# $FreeBSD$
 #
 # System-wide .profile file for sh(1).
 # Uncomment this to give you the default 4.2 behavior, where disk 
diff --git a/etc/protocols b/etc/protocols
index 84f690e901cb..f486ce3d7fe6 100644
--- a/etc/protocols
+++ b/etc/protocols
@@ -1,7 +1,7 @@
 #
 # Internet protocols
 #
-#	$Id: protocols,v 1.11 1999/06/06 14:00:10 andreas Exp $
+# $FreeBSD$
 #	from: @(#)protocols	5.1 (Berkeley) 4/17/89
 #
 # See also http://www.isi.edu/in-notes/iana/assignments/protocol-numbers
diff --git a/etc/rc b/etc/rc
index af54ee01cc4f..9a4877a85019 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$Id: rc,v 1.193 1999/08/06 06:22:43 peter Exp $
+# $FreeBSD$
 #	From: @(#)rc	5.27 (Berkeley) 6/5/91
 
 # System startup script run by init on autoboot
diff --git a/etc/rc.atm b/etc/rc.atm
index 96d82bec11d2..57ff149bc2eb 100644
--- a/etc/rc.atm
+++ b/etc/rc.atm
@@ -3,7 +3,7 @@
 
 # ATM networking startup script
 #
-#	$Id: rc.atm,v 1.2 1998/10/08 08:56:01 phk Exp $
+# $FreeBSD$
 
 #
 # Initial interface configuration.
diff --git a/etc/rc.d/atm1 b/etc/rc.d/atm1
index 96d82bec11d2..57ff149bc2eb 100644
--- a/etc/rc.d/atm1
+++ b/etc/rc.d/atm1
@@ -3,7 +3,7 @@
 
 # ATM networking startup script
 #
-#	$Id: rc.atm,v 1.2 1998/10/08 08:56:01 phk Exp $
+# $FreeBSD$
 
 #
 # Initial interface configuration.
diff --git a/etc/rc.d/atm2 b/etc/rc.d/atm2
index 96d82bec11d2..57ff149bc2eb 100644
--- a/etc/rc.d/atm2
+++ b/etc/rc.d/atm2
@@ -3,7 +3,7 @@
 
 # ATM networking startup script
 #
-#	$Id: rc.atm,v 1.2 1998/10/08 08:56:01 phk Exp $
+# $FreeBSD$
 
 #
 # Initial interface configuration.
diff --git a/etc/rc.d/atm2.sh b/etc/rc.d/atm2.sh
index 96d82bec11d2..57ff149bc2eb 100644
--- a/etc/rc.d/atm2.sh
+++ b/etc/rc.d/atm2.sh
@@ -3,7 +3,7 @@
 
 # ATM networking startup script
 #
-#	$Id: rc.atm,v 1.2 1998/10/08 08:56:01 phk Exp $
+# $FreeBSD$
 
 #
 # Initial interface configuration.
diff --git a/etc/rc.d/atm3 b/etc/rc.d/atm3
index 96d82bec11d2..57ff149bc2eb 100644
--- a/etc/rc.d/atm3
+++ b/etc/rc.d/atm3
@@ -3,7 +3,7 @@
 
 # ATM networking startup script
 #
-#	$Id: rc.atm,v 1.2 1998/10/08 08:56:01 phk Exp $
+# $FreeBSD$
 
 #
 # Initial interface configuration.
diff --git a/etc/rc.d/atm3.sh b/etc/rc.d/atm3.sh
index 96d82bec11d2..57ff149bc2eb 100644
--- a/etc/rc.d/atm3.sh
+++ b/etc/rc.d/atm3.sh
@@ -3,7 +3,7 @@
 
 # ATM networking startup script
 #
-#	$Id: rc.atm,v 1.2 1998/10/08 08:56:01 phk Exp $
+# $FreeBSD$
 
 #
 # Initial interface configuration.
diff --git a/etc/rc.d/isdnd b/etc/rc.d/isdnd
index 70370c206b34..11e140a8895f 100644
--- a/etc/rc.d/isdnd
+++ b/etc/rc.d/isdnd
@@ -6,7 +6,7 @@
 #
 #	last edit-date: [Mon Mar  8 12:15:56 1999]
 #
-#	$Id: rc.isdn,v 1.2 1999/03/08 11:28:45 hm Exp $
+# $FreeBSD$
 #
 #---------------------------------------------------------------------------
 
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index 40cfcad87f27..9c5f4aaab133 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.56 1999/08/25 16:01:37 sheldonh Exp $
+# $FreeBSD$
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index 40cfcad87f27..9c5f4aaab133 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.56 1999/08/25 16:01:37 sheldonh Exp $
+# $FreeBSD$
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index 40cfcad87f27..9c5f4aaab133 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.56 1999/08/25 16:01:37 sheldonh Exp $
+# $FreeBSD$
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index 40cfcad87f27..9c5f4aaab133 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.56 1999/08/25 16:01:37 sheldonh Exp $
+# $FreeBSD$
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
diff --git a/etc/rc.d/pccard b/etc/rc.d/pccard
index 6cd1e775ff57..92a4ee3dbc1b 100644
--- a/etc/rc.d/pccard
+++ b/etc/rc.d/pccard
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #	PC-card startup script
-#	$Id: rc.pccard,v 1.16 1999/07/26 01:08:16 obrien Exp $
+# $FreeBSD$
 
 if [ "${pccard_enable}" = "YES" ] ; then
 	if [ "${pccard_mem}" != "DEFAULT" ] ; then
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index 40cfcad87f27..9c5f4aaab133 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.56 1999/08/25 16:01:37 sheldonh Exp $
+# $FreeBSD$
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
diff --git a/etc/rc.d/serial b/etc/rc.d/serial
index cc69e9158f28..9d66530e454d 100644
--- a/etc/rc.d/serial
+++ b/etc/rc.d/serial
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: rc.serial,v 1.12 1999/08/25 16:01:37 sheldonh Exp $
+# $FreeBSD$
 
 # Change some defaults for serial devices.
 # Standard defaults are:
diff --git a/etc/rc.d/sysctl b/etc/rc.d/sysctl
index bc98de967fd9..2c00357491b8 100644
--- a/etc/rc.d/sysctl
+++ b/etc/rc.d/sysctl
@@ -2,7 +2,7 @@
 #
 # Read in /etc/sysctl.conf and set things accordingly
 #
-# $Id: rc.sysctl,v 1.1 1999/03/28 20:36:03 imp Exp $
+# $FreeBSD$
 if [ -f /etc/sysctl.conf ]; then
 	3< /etc/sysctl.conf
 	while read 0<&3 var;
diff --git a/etc/rc.devfs b/etc/rc.devfs
index 799445baafc9..339cbdbf48cb 100644
--- a/etc/rc.devfs
+++ b/etc/rc.devfs
@@ -1,5 +1,5 @@
 #
-# $Id: rc.devfs,v 1.3 1998/10/13 08:25:09 jkh Exp $
+# $FreeBSD$
 #
 # If there is a global system configuration file, suck it in.
 if [ -f /etc/defaults/rc.conf ]; then
diff --git a/etc/rc.firewall b/etc/rc.firewall
index 675e262beb6c..af9390179dec 100644
--- a/etc/rc.firewall
+++ b/etc/rc.firewall
@@ -1,6 +1,6 @@
 ############
 # Setup system for firewall service.
-# $Id: rc.firewall,v 1.20 1999/02/10 18:08:16 jkh Exp $
+# $FreeBSD$
 
 # Suck in the configuration variables.
 if [ -f /etc/defaults/rc.conf ]; then
diff --git a/etc/rc.isdn b/etc/rc.isdn
index 70370c206b34..11e140a8895f 100644
--- a/etc/rc.isdn
+++ b/etc/rc.isdn
@@ -6,7 +6,7 @@
 #
 #	last edit-date: [Mon Mar  8 12:15:56 1999]
 #
-#	$Id: rc.isdn,v 1.2 1999/03/08 11:28:45 hm Exp $
+# $FreeBSD$
 #
 #---------------------------------------------------------------------------
 
diff --git a/etc/rc.network b/etc/rc.network
index 40cfcad87f27..9c5f4aaab133 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.56 1999/08/25 16:01:37 sheldonh Exp $
+# $FreeBSD$
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
diff --git a/etc/rc.pccard b/etc/rc.pccard
index 6cd1e775ff57..92a4ee3dbc1b 100644
--- a/etc/rc.pccard
+++ b/etc/rc.pccard
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #	PC-card startup script
-#	$Id: rc.pccard,v 1.16 1999/07/26 01:08:16 obrien Exp $
+# $FreeBSD$
 
 if [ "${pccard_enable}" = "YES" ] ; then
 	if [ "${pccard_mem}" != "DEFAULT" ] ; then
diff --git a/etc/rc.resume b/etc/rc.resume
index a794a8d9ef5c..74db8ed579a6 100755
--- a/etc/rc.resume
+++ b/etc/rc.resume
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$Id: rc.resume,v 1.1.1 1999/07/09 01:34:57 iwasaki Exp $
+# $FreeBSD$
 #
 # sample run command file for APM Resume Event
 
diff --git a/etc/rc.serial b/etc/rc.serial
index cc69e9158f28..9d66530e454d 100644
--- a/etc/rc.serial
+++ b/etc/rc.serial
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: rc.serial,v 1.12 1999/08/25 16:01:37 sheldonh Exp $
+# $FreeBSD$
 
 # Change some defaults for serial devices.
 # Standard defaults are:
diff --git a/etc/rc.shutdown b/etc/rc.shutdown
index f935834d1898..e241721936bc 100644
--- a/etc/rc.shutdown
+++ b/etc/rc.shutdown
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$Id$
+# $FreeBSD$
 
 # site-specific closing actions for daemons run by init on shutdown
 # or before going single-user from multi-user.
diff --git a/etc/rc.suspend b/etc/rc.suspend
index b60c2cf1719f..9b6f815915af 100755
--- a/etc/rc.suspend
+++ b/etc/rc.suspend
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$Id: rc.suspend,v 1.1.1 1999/07/09 01:34:57 iwasaki Exp $
+# $FreeBSD$
 #
 # sample run command file for APM Suspend Event
 
diff --git a/etc/rc.sysctl b/etc/rc.sysctl
index bc98de967fd9..2c00357491b8 100644
--- a/etc/rc.sysctl
+++ b/etc/rc.sysctl
@@ -2,7 +2,7 @@
 #
 # Read in /etc/sysctl.conf and set things accordingly
 #
-# $Id: rc.sysctl,v 1.1 1999/03/28 20:36:03 imp Exp $
+# $FreeBSD$
 if [ -f /etc/sysctl.conf ]; then
 	3< /etc/sysctl.conf
 	while read 0<&3 var;
diff --git a/etc/remote b/etc/remote
index e564c8b837f5..37a25f5d5814 100644
--- a/etc/remote
+++ b/etc/remote
@@ -1,4 +1,4 @@
-#	$Id:$
+# $FreeBSD$
 #
 #	@(#)remote	5.2 (Berkeley) 6/30/90
 #
diff --git a/etc/root/dot.cshrc b/etc/root/dot.cshrc
index 9b1046668331..7b66bd1b559c 100644
--- a/etc/root/dot.cshrc
+++ b/etc/root/dot.cshrc
@@ -1,4 +1,4 @@
-#	$Id: dot.cshrc,v 1.22 1998/09/13 23:05:47 brian Exp $
+# $FreeBSD$
 #
 #csh .cshrc file
 
diff --git a/etc/root/dot.klogin b/etc/root/dot.klogin
index 7faa46575a3e..55e653a13323 100644
--- a/etc/root/dot.klogin
+++ b/etc/root/dot.klogin
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 #
 # user1.root@your.realm.wherever
 # user2.root@your.realm.wherever
diff --git a/etc/root/dot.login b/etc/root/dot.login
index c156473c07af..9d9d3a50fdaf 100644
--- a/etc/root/dot.login
+++ b/etc/root/dot.login
@@ -1,4 +1,4 @@
-#	$Id: dot.login,v 1.17 1998/09/13 23:05:47 brian Exp $
+# $FreeBSD$
 #
 # csh .login file
 #
diff --git a/etc/root/dot.profile b/etc/root/dot.profile
index 943ef60e7667..bcf606d1047e 100644
--- a/etc/root/dot.profile
+++ b/etc/root/dot.profile
@@ -1,4 +1,4 @@
-#	$Id: dot.profile,v 1.18 1999/04/27 11:55:02 jkh Exp $
+# $FreeBSD$
 #
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
 export PATH
diff --git a/etc/rpc b/etc/rpc
index fd4e85676ada..a662bf947066 100644
--- a/etc/rpc
+++ b/etc/rpc
@@ -1,5 +1,5 @@
 #
-#	$Id:$
+# $FreeBSD$
 # rpc 88/08/01 4.0 RPCSRC; from 1.12   88/02/07 SMI
 #
 portmapper	100000	portmap sunrpc
diff --git a/etc/security b/etc/security
index 15e32fa93d72..0eb9ab3c8542 100644
--- a/etc/security
+++ b/etc/security
@@ -1,7 +1,7 @@
 #!/bin/sh -
 #
 #	@(#)security	5.3 (Berkeley) 5/28/91
-#	$Id: security,v 1.30 1999/06/23 14:23:54 sheldonh Exp $
+# $FreeBSD$
 #
 PATH=/sbin:/bin:/usr/bin
 LC_ALL=C; export LC_ALL
diff --git a/etc/sendmail/Makefile b/etc/sendmail/Makefile
index 2c4a2f3730a8..ea1952989ece 100644
--- a/etc/sendmail/Makefile
+++ b/etc/sendmail/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.19 (Berkeley) 1/14/97
-#	$Id$
+# $FreeBSD$
 
 M4=	m4
 CFDIR=	${.CURDIR}/../../contrib/sendmail/cf
diff --git a/etc/sendmail/freefall.mc b/etc/sendmail/freefall.mc
index 0dea3adb9ba5..2f4480e3a0a9 100644
--- a/etc/sendmail/freefall.mc
+++ b/etc/sendmail/freefall.mc
@@ -40,7 +40,7 @@ divert(-1)
 #
 
 divert(0)dnl
-VERSIONID(`$Id: freefall.mc,v 1.13 1999/05/11 03:27:14 jmb Exp $')
+VERSIONID(`$FreeBSD$')
 
 OSTYPE(bsd4.4)
 FEATURE(nullclient, hub.$m)
diff --git a/etc/services b/etc/services
index c6ae6c9663ca..faa4f20a33c0 100644
--- a/etc/services
+++ b/etc/services
@@ -16,7 +16,7 @@
 # Kerberos services are for Kerberos v4, and are unofficial.  Sites running
 # v5 should uncomment v5 entries and comment v4 entries.
 #
-#	$Id: services,v 1.60 1999/07/02 16:55:04 nsayer Exp $
+# $FreeBSD$
 #	From: @(#)services	5.8 (Berkeley) 5/9/91
 #
 # WELL KNOWN PORT NUMBERS
diff --git a/etc/shells b/etc/shells
index f94e0cd53427..964bcbf67264 100644
--- a/etc/shells
+++ b/etc/shells
@@ -1,4 +1,4 @@
-#	$Id:$
+# $FreeBSD$
 #
 # List of acceptable shells for chpass(1).
 # Ftpd will not allow users to connect who are not using
diff --git a/etc/syslog.conf b/etc/syslog.conf
index 7e17ebc03dea..efa23cf2efed 100644
--- a/etc/syslog.conf
+++ b/etc/syslog.conf
@@ -1,4 +1,4 @@
-#	$Id: syslog.conf,v 1.9 1998/10/14 21:59:55 nate Exp $
+# $FreeBSD$
 #
 #	Spaces are NOT valid field separators in this file.
 #	Consult the syslog.conf(5) manpage.
diff --git a/games/Makefile b/games/Makefile
index 74e055137643..02b1a550de56 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 3/31/94
-#	$Id: Makefile,v 1.14 1998/02/11 19:52:53 jdp Exp $
+# $FreeBSD$
 
 # XXX missing: chess ching monop [copyright]
 SUBDIR= adventure \
diff --git a/games/adventure/adventure.6 b/games/adventure/adventure.6
index bf6ea01b2657..501a3e11bc5e 100644
--- a/games/adventure/adventure.6
+++ b/games/adventure/adventure.6
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)adventure.6	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 31, 1993
 .Dt ADVENTURE 6
diff --git a/games/arithmetic/arithmetic.6 b/games/arithmetic/arithmetic.6
index a62fba662e65..1b8ccaef1c64 100644
--- a/games/arithmetic/arithmetic.6
+++ b/games/arithmetic/arithmetic.6
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)arithmetic.6	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH ARITHMETIC 6 "May 31, 1993"
 .UC 4
diff --git a/games/atc/atc.6 b/games/atc/atc.6
index dbe45b671a65..10cc7c1ab0a8 100644
--- a/games/atc/atc.6
+++ b/games/atc/atc.6
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)atc.6	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .       \" XP - exdented paragraph
 .de XP
diff --git a/games/backgammon/backgammon/backgammon.6 b/games/backgammon/backgammon/backgammon.6
index 864b4030e013..bf035ddb10a2 100644
--- a/games/backgammon/backgammon/backgammon.6
+++ b/games/backgammon/backgammon/backgammon.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)backgammon.6	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH BACKGAMMON 6  "May 31, 1993"
 .UC 5
diff --git a/games/battlestar/battlestar.6 b/games/battlestar/battlestar.6
index f9b9d4e33d47..814c299d4e83 100644
--- a/games/battlestar/battlestar.6
+++ b/games/battlestar/battlestar.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)battlestar.6	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH BATTLESTAR 6 "May 31, 1993
 .UC 6
diff --git a/games/bcd/bcd.6 b/games/bcd/bcd.6
index 7dd10b58b781..e06dafe20cbf 100644
--- a/games/bcd/bcd.6
+++ b/games/bcd/bcd.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)bcd.6	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 31, 1993
 .Dt "BCD" 6
diff --git a/games/bs/Makefile b/games/bs/Makefile
index 876e50272e80..c0905c94cd0f 100644
--- a/games/bs/Makefile
+++ b/games/bs/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.3 1997/02/22 14:46:48 peter Exp $
+# $FreeBSD$
 
 PROG=   bs
 MAN6=   bs.6
diff --git a/games/caesar/caesar.6 b/games/caesar/caesar.6
index c6927d40d4a7..59abc49a1333 100644
--- a/games/caesar/caesar.6
+++ b/games/caesar/caesar.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)caesar.6	8.2 (Berkeley) 11/16/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd November 16, 1993
 .Dt CAESAR 6
diff --git a/games/canfield/canfield/canfield.6 b/games/canfield/canfield/canfield.6
index 8acd1d09fce2..6cde04cc47ca 100644
--- a/games/canfield/canfield/canfield.6
+++ b/games/canfield/canfield/canfield.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)canfield.6	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH CANFIELD 6 "May 31, 1993"
 .UC 5
diff --git a/games/cribbage/cribbage.6 b/games/cribbage/cribbage.6
index 96a589bba8af..14e9755b4f71 100644
--- a/games/cribbage/cribbage.6
+++ b/games/cribbage/cribbage.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cribbage.6	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH CRIBBAGE 6 "May 31, 1993"
 .UC 4
diff --git a/games/dm/dm.8 b/games/dm/dm.8
index fe5d9046005d..f324db6d0316 100644
--- a/games/dm/dm.8
+++ b/games/dm/dm.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dm.8	8.1 (Berkeley) 5/31/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd May 31, 1993
 .Dt DM 8
diff --git a/games/dm/dm.conf.5 b/games/dm/dm.conf.5
index 8c3b6842eacd..cc055f58aa4b 100644
--- a/games/dm/dm.conf.5
+++ b/games/dm/dm.conf.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dm.conf.5	8.1 (Berkeley) 5/31/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd May 31, 1993
 .Dt DM.CONF 5
diff --git a/games/factor/factor.6 b/games/factor/factor.6
index 1dda93d60bfe..576e9528b1c2 100644
--- a/games/factor/factor.6
+++ b/games/factor/factor.6
@@ -34,7 +34,7 @@
 .\"
 .\"	@(#)factor.6	8.1 (Berkeley) 5/31/93
 .\"
-.\"	$Id:$
+.\" $FreeBSD$
 .\"
 .\" By: Landon Curt Noll   chongo@toad.com,   ...!{sun,tolsoft}!hoptoad!chongo
 .\"
diff --git a/games/fish/fish.6 b/games/fish/fish.6
index 00d1fb58e0f9..fd4d682611fe 100644
--- a/games/fish/fish.6
+++ b/games/fish/fish.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fish.6	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH FISH 6 "May 31, 1993"
 .UC 4
diff --git a/games/fortune/fortune/fortune.6 b/games/fortune/fortune/fortune.6
index 62265c058ea0..cd5be88ef1ed 100644
--- a/games/fortune/fortune/fortune.6
+++ b/games/fortune/fortune/fortune.6
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fortune.6	8.3 (Berkeley) 4/19/94
-.\"	$Id: fortune.6,v 1.5 1997/02/22 14:46:50 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt FORTUNE 6
diff --git a/games/fortune/strfile/strfile.8 b/games/fortune/strfile/strfile.8
index b6d2d9138ff9..e5598e6cb1dd 100644
--- a/games/fortune/strfile/strfile.8
+++ b/games/fortune/strfile/strfile.8
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strfile.8	8.1 (Berkeley) 6/9/93
-.\"     $Id: strfile.8,v 1.2 1999/07/12 20:30:26 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt STRFILE 8
diff --git a/games/grdc/Makefile b/games/grdc/Makefile
index 17522b8c54c8..dd22a236219c 100644
--- a/games/grdc/Makefile
+++ b/games/grdc/Makefile
@@ -1,4 +1,4 @@
-#       $Id$
+# $FreeBSD$
 
 PROG=   grdc
 MAN6=   grdc.6
diff --git a/games/hack/hack.version.c b/games/hack/hack.version.c
index ff34ec3bb18e..0fe78854972b 100644
--- a/games/hack/hack.version.c
+++ b/games/hack/hack.version.c
@@ -1,6 +1,6 @@
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* hack.version.c - version 1.0.3 */
-/* $Id$ */
+/* $FreeBSD$ */
 
 #include	"date.h"
 
diff --git a/games/hangman/hangman.6 b/games/hangman/hangman.6
index 08c7a981039d..e1ab323815ae 100644
--- a/games/hangman/hangman.6
+++ b/games/hangman/hangman.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hangman.6	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH HANGMAN 6 "May 31, 1993"
 .UC 4
diff --git a/games/larn/larn.6 b/games/larn/larn.6
index 7d7ac54a4ad7..ec55fef246e2 100644
--- a/games/larn/larn.6
+++ b/games/larn/larn.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)larn.6	5.5 (Berkeley) 12/30/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt LARN 6
diff --git a/games/mille/mille.6 b/games/mille/mille.6
index 234f51e254ae..5d05e7ae4a04 100644
--- a/games/mille/mille.6
+++ b/games/mille/mille.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mille.6	8.2 (Berkeley) 12/30/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH MILLE 6 "December 30, 1993"
 .UC 4
diff --git a/games/mille/mille.c b/games/mille/mille.c
index cd86dd40c225..b2c5c156958d 100644
--- a/games/mille/mille.c
+++ b/games/mille/mille.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mille.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 # include	"mille.h"
diff --git a/games/number/number.6 b/games/number/number.6
index 201e271cff56..a7b339db814b 100644
--- a/games/number/number.6
+++ b/games/number/number.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)number.6	8.2 (Berkeley) 3/31/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd March 31, 1994
 .Dt NUMBER 6
diff --git a/games/phantasia/phantasia.6 b/games/phantasia/phantasia.6
index 107be462a709..ab0733c994e4 100644
--- a/games/phantasia/phantasia.6
+++ b/games/phantasia/phantasia.6
@@ -1,4 +1,4 @@
-.\" $Id: phantasia.6,v 1.4 1997/02/22 14:46:55 peter Exp $
+.\" $FreeBSD$
 .\"
 .de sh
 .br
diff --git a/games/piano/piano.c b/games/piano/piano.c
index 8e16b3ade6d2..2706d1091cbd 100644
--- a/games/piano/piano.c
+++ b/games/piano/piano.c
@@ -1,7 +1,8 @@
 /*
  * piano.c - a piano emulator
  */
-static char rcsid[] = "$Id: piano.c,v 1.4 1997/02/22 14:46:57 peter Exp $";
+static char rcsid[] =
+  "$FreeBSD$";
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/games/pig/pig.6 b/games/pig/pig.6
index 7a33b31a17c6..c97b50f95fcd 100644
--- a/games/pig/pig.6
+++ b/games/pig/pig.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pig.6	8.1 (Berkeley) 6/10/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 10, 1993
 .Dt PIG 6
diff --git a/games/pom/pom.6 b/games/pom/pom.6
index c7dc45a1f1a0..00dae120f1b9 100644
--- a/games/pom/pom.6
+++ b/games/pom/pom.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pom.6	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH POM 6 "May 31, 1993"
 .UC 7
diff --git a/games/quiz/quiz.6 b/games/quiz/quiz.6
index 889d2d4b87ab..7234989b7484 100644
--- a/games/quiz/quiz.6
+++ b/games/quiz/quiz.6
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)quiz.6	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 31, 1993
 .Dt QUIZ 6
diff --git a/games/rain/rain.6 b/games/rain/rain.6
index 04b42df1c2bc..85c86f68e703 100644
--- a/games/rain/rain.6
+++ b/games/rain/rain.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rain.6	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH RAIN 6 "May 31, 1993"
 .UC 4
diff --git a/games/random/random.6 b/games/random/random.6
index ac1ea840ffe0..63eddb271255 100644
--- a/games/random/random.6
+++ b/games/random/random.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)random.6	8.2 (Berkeley) 3/31/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd March 31, 1994
 .Dt RANDOM 6
diff --git a/games/robots/robots.6 b/games/robots/robots.6
index fe0de4aceb66..fea968677660 100644
--- a/games/robots/robots.6
+++ b/games/robots/robots.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)robots.6	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH ROBOTS 6 "May 31, 1993"
 .UC 6
diff --git a/games/rogue/rogue.6 b/games/rogue/rogue.6
index 2f2c9b95b74e..ca3d56e1e564 100644
--- a/games/rogue/rogue.6
+++ b/games/rogue/rogue.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rogue.6	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH ROGUE 6 "May 31, 1993"
 .UC 4
diff --git a/games/sail/sail.6 b/games/sail/sail.6
index 6fb647be459c..0455e06b08f3 100644
--- a/games/sail/sail.6
+++ b/games/sail/sail.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sail.6	8.2 (Berkeley) 12/30/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH SAIL 6 "December 30, 1993"
 .UC 4
diff --git a/games/snake/snake/snake.6 b/games/snake/snake/snake.6
index b6a4a3504936..057546992ce1 100644
--- a/games/snake/snake/snake.6
+++ b/games/snake/snake/snake.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)snake.6	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH SNAKE 6 "May 31, 1993"
 .UC 4
diff --git a/games/trek/trek.6 b/games/trek/trek.6
index 334b6a2c06d4..a0ebd20253fb 100644
--- a/games/trek/trek.6
+++ b/games/trek/trek.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)trek.6	8.2 (Berkeley) 12/30/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH TREK 6 "December 30, 1993"
 .UC 4
diff --git a/games/worm/worm.6 b/games/worm/worm.6
index e9e423f9761b..f9828fd7ebde 100644
--- a/games/worm/worm.6
+++ b/games/worm/worm.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)worm.6	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH WORM 6 "May 31, 1993"
 .UC 4
diff --git a/games/worms/worms.6 b/games/worms/worms.6
index 74939355ecc4..374d18d6910e 100644
--- a/games/worms/worms.6
+++ b/games/worms/worms.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)worms.6	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd May 31, 1993
 .Dt WORMS 6
diff --git a/games/wump/wump.6 b/games/wump/wump.6
index d8d42323037c..61bf26ef74fd 100644
--- a/games/wump/wump.6
+++ b/games/wump/wump.6
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)wump.6	8.1 (Berkeley) 5/31/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH WUMP 6 "May 31, 1993"
 .UC 7
diff --git a/gnu/Makefile b/gnu/Makefile
index 88925400f1cd..30c64596aa1b 100644
--- a/gnu/Makefile
+++ b/gnu/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.33.1.1 (Berkeley) 5/6/91
-#	$Id$
+# $FreeBSD$
 
 SUBDIR= include lib libexec usr.bin usr.sbin
 
diff --git a/gnu/gnu2bmake/gcc-2.6.0.tcl b/gnu/gnu2bmake/gcc-2.6.0.tcl
index 97181aa8990f..ba378e04b8f0 100644
--- a/gnu/gnu2bmake/gcc-2.6.0.tcl
+++ b/gnu/gnu2bmake/gcc-2.6.0.tcl
@@ -7,7 +7,7 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $Id$
+# $FreeBSD$
 #
 
 source gnu2bmake.tcl
@@ -116,7 +116,7 @@ sh "mkdir $ddir/legal"
 sh "cp $sdir/gen-*.c $sdir/md $ddir/legal"
 set f [open $ddir/README w]
 puts $f {
-$Id$
+$FreeBSD$
 
 This directory contains gcc in a form that uses "bmake" makefiles.
 This is not the place you want to start, if you want to hack gcc.
diff --git a/gnu/gnu2bmake/gcc-2.6.1.tcl b/gnu/gnu2bmake/gcc-2.6.1.tcl
index d2aac484df23..6ab0a4b339ee 100755
--- a/gnu/gnu2bmake/gcc-2.6.1.tcl
+++ b/gnu/gnu2bmake/gcc-2.6.1.tcl
@@ -7,7 +7,7 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $Id$
+# $FreeBSD$
 #
 # Good for 2.6.1 and 2.6.2
 
@@ -95,7 +95,7 @@ set target [makefile_macro target $sdir]
 sh "rm -rf $ddir"
 sh "mkdir $ddir"
 set f [open $ddir/Makefile.inc w]
-puts $f "#\n# \$Id$\n#\n"
+puts $f "#\n# \$FreeBSD$\n#\n"
 puts $f "CFLAGS+=\t-I\${.CURDIR} -I\${.CURDIR}/../include"
 puts $f "CFLAGS+=\t-Dbsd4_4"
 puts $f "CFLAGS+=\t-DGCC_INCLUDE_DIR=\\\"FOO\\\""
@@ -124,7 +124,7 @@ puts $f ".endif"
 close $f
 
 set f [open $ddir/Makefile w]
-puts $f "#\n# \$Id$\n#\n"
+puts $f "#\n# \$FreeBSD$\n#\n"
 puts $f "PGMDIR=\tcc_int cpp cc1 cc cc1plus c++ f77 libgcc"
 puts $f "SUBDIR=\t\$(PGMDIR)"
 puts $f "\n.include <bsd.subdir.mk>"
@@ -135,7 +135,7 @@ sh "mkdir $ddir/legal"
 sh "cp $sdir/gen-*.c $sdir/md $ddir/legal"
 set f [open $ddir/README w]
 puts $f {
-$Id$
+$FreeBSD$
 
 This directory contains gcc in a form that uses "bmake" makefiles.
 This is not the place you want to start, if you want to hack gcc.
@@ -154,7 +154,7 @@ Thankyou.
 # do ~/libgcc
 sh "mkdir $ddir/libgcc"
 set f [open $ddir/libgcc/Makefile w]
-puts $f "#\n# \$Id$\n#\n"
+puts $f "#\n# \$FreeBSD$\n#\n"
 puts $f "LIB=\tgcc"
 puts $f "INSTALL_PIC_ARCHIVE=\tyes"
 puts $f "SHLIB_MAJOR=\t261"
diff --git a/gnu/gnu2bmake/gnu2bmake.tcl b/gnu/gnu2bmake/gnu2bmake.tcl
index b2ec65fa6f74..4040c5363f30 100644
--- a/gnu/gnu2bmake/gnu2bmake.tcl
+++ b/gnu/gnu2bmake/gnu2bmake.tcl
@@ -7,7 +7,7 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $Id$
+# $FreeBSD$
 #
 #######################################################################
 # Generic procedures usable in the process of gnu-to-bmake jobs.
@@ -166,7 +166,7 @@ proc makefile_macro {macro dir {makefile Makefile}} {
 proc mk_prog {ddir name list {make ""}} {
     sh "mkdir $ddir/$name"
     set f [open $ddir/$name/Makefile w]
-    puts $f "#\n# \$Id$\n#\n"
+    puts $f "#\n# \$FreeBSD$\n#\n"
     puts $f "PROG =\t$name"
     puts $f "SRCS =\t[lsort $list]"
     foreach i $make {puts $f $i}
@@ -184,7 +184,7 @@ proc mk_prog {ddir name list {make ""}} {
 proc mk_lib {ddir name list {make ""}} {
     sh "mkdir $ddir/$name"
     set f [open $ddir/$name/Makefile w]
-    puts $f "#\n# \$Id$\n#\n"
+    puts $f "#\n# \$FreeBSD$\n#\n"
     puts $f "SRCS =\t[lsort $list]"
     puts $f "LIB =\t$name"
     foreach i $make {puts $f $i}
diff --git a/gnu/gnu2bmake/libg++-2.6.tcl b/gnu/gnu2bmake/libg++-2.6.tcl
index b5d21c29bb1a..9ae1c9cb00d3 100644
--- a/gnu/gnu2bmake/libg++-2.6.tcl
+++ b/gnu/gnu2bmake/libg++-2.6.tcl
@@ -7,7 +7,7 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $Id$
+# $FreeBSD$
 #
 
 source gnu2bmake.tcl
diff --git a/gnu/include/Makefile b/gnu/include/Makefile
index a6faf8931942..604971fb4ecf 100644
--- a/gnu/include/Makefile
+++ b/gnu/include/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 NOOBJ=	noobj
 
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile
index 03962a5e5a92..1676b4752022 100644
--- a/gnu/lib/Makefile
+++ b/gnu/lib/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.22 1999/04/14 00:24:02 obrien Exp $
+# $FreeBSD$
 
 SUBDIR= libdialog libgcc libgcc_r libgmp libmp libobjc libregex libreadline \
 	libstdc++
diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile
index a543ce632bd4..284409a88a61 100644
--- a/gnu/lib/libdialog/Makefile
+++ b/gnu/lib/libdialog/Makefile
@@ -1,5 +1,5 @@
 # Makefile for libdialog
-# $Id: Makefile,v 1.23 1998/09/28 00:52:53 jkh Exp $
+# $FreeBSD$
 
 LIB=    dialog
 MAN3=	dialog.3
diff --git a/gnu/lib/libdialog/TESTS/Makefile b/gnu/lib/libdialog/TESTS/Makefile
index 25a2665593c2..8abf06f93d57 100644
--- a/gnu/lib/libdialog/TESTS/Makefile
+++ b/gnu/lib/libdialog/TESTS/Makefile
@@ -1,6 +1,6 @@
 # Really quick and evil Makefile for building all the tests.  I wish that bmake was friendlier to
 # the concept of multiple progs/libs in the same directory.
-# $Id: Makefile,v 1.7 1997/02/22 15:42:37 peter Exp $
+# $FreeBSD$
 
 PROGS=	msg yesno prgbox gauge dselect fselect text menu1 menu2 menu3 \
 	input1 input2 check1 check2 check3 radio1 radio2 radio3 \
diff --git a/gnu/lib/libdialog/TESTS/check1.c b/gnu/lib/libdialog/TESTS/check1.c
index fe4f6c81652f..a8eabc10db76 100644
--- a/gnu/lib/libdialog/TESTS/check1.c
+++ b/gnu/lib/libdialog/TESTS/check1.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/check2.c b/gnu/lib/libdialog/TESTS/check2.c
index 7e5320e82294..3cdb6ae5ef41 100644
--- a/gnu/lib/libdialog/TESTS/check2.c
+++ b/gnu/lib/libdialog/TESTS/check2.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/check3.c b/gnu/lib/libdialog/TESTS/check3.c
index 8c8f4bfdf98e..c5e7f925b476 100644
--- a/gnu/lib/libdialog/TESTS/check3.c
+++ b/gnu/lib/libdialog/TESTS/check3.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/gnu/lib/libdialog/TESTS/dselect.c b/gnu/lib/libdialog/TESTS/dselect.c
index 3196075120a4..66a786660a83 100644
--- a/gnu/lib/libdialog/TESTS/dselect.c
+++ b/gnu/lib/libdialog/TESTS/dselect.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/fselect.c b/gnu/lib/libdialog/TESTS/fselect.c
index d8511ad75fde..2fb7aa844544 100644
--- a/gnu/lib/libdialog/TESTS/fselect.c
+++ b/gnu/lib/libdialog/TESTS/fselect.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/gauge.c b/gnu/lib/libdialog/TESTS/gauge.c
index a160bda5d247..803d09458262 100644
--- a/gnu/lib/libdialog/TESTS/gauge.c
+++ b/gnu/lib/libdialog/TESTS/gauge.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/input1.c b/gnu/lib/libdialog/TESTS/input1.c
index fa4f13fe305c..bdb78b0e2ae7 100644
--- a/gnu/lib/libdialog/TESTS/input1.c
+++ b/gnu/lib/libdialog/TESTS/input1.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/input2.c b/gnu/lib/libdialog/TESTS/input2.c
index 9c6b2dabce8d..85368244e323 100644
--- a/gnu/lib/libdialog/TESTS/input2.c
+++ b/gnu/lib/libdialog/TESTS/input2.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/menu1.c b/gnu/lib/libdialog/TESTS/menu1.c
index a861c46632af..fbdebcbffea4 100644
--- a/gnu/lib/libdialog/TESTS/menu1.c
+++ b/gnu/lib/libdialog/TESTS/menu1.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/menu2.c b/gnu/lib/libdialog/TESTS/menu2.c
index d572b52eec62..a081d3263324 100644
--- a/gnu/lib/libdialog/TESTS/menu2.c
+++ b/gnu/lib/libdialog/TESTS/menu2.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/menu3.c b/gnu/lib/libdialog/TESTS/menu3.c
index 6409f3a77883..5f42b151c8fb 100644
--- a/gnu/lib/libdialog/TESTS/menu3.c
+++ b/gnu/lib/libdialog/TESTS/menu3.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/msg.c b/gnu/lib/libdialog/TESTS/msg.c
index 591e69b0e42c..7594b599efe7 100644
--- a/gnu/lib/libdialog/TESTS/msg.c
+++ b/gnu/lib/libdialog/TESTS/msg.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/prgbox.c b/gnu/lib/libdialog/TESTS/prgbox.c
index 697f96c66c95..f09190cf7a95 100644
--- a/gnu/lib/libdialog/TESTS/prgbox.c
+++ b/gnu/lib/libdialog/TESTS/prgbox.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/radio1.c b/gnu/lib/libdialog/TESTS/radio1.c
index e9676ba773c1..2cdb0c5e4bd1 100644
--- a/gnu/lib/libdialog/TESTS/radio1.c
+++ b/gnu/lib/libdialog/TESTS/radio1.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/radio2.c b/gnu/lib/libdialog/TESTS/radio2.c
index f5436b6350a3..1dee3c034acc 100644
--- a/gnu/lib/libdialog/TESTS/radio2.c
+++ b/gnu/lib/libdialog/TESTS/radio2.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/radio3.c b/gnu/lib/libdialog/TESTS/radio3.c
index 0c7e1fad0827..80fa38075763 100644
--- a/gnu/lib/libdialog/TESTS/radio3.c
+++ b/gnu/lib/libdialog/TESTS/radio3.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/text.c b/gnu/lib/libdialog/TESTS/text.c
index 2f59973978fe..d13a121bb891 100644
--- a/gnu/lib/libdialog/TESTS/text.c
+++ b/gnu/lib/libdialog/TESTS/text.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/TESTS/yesno.c b/gnu/lib/libdialog/TESTS/yesno.c
index 943ef0e4c6cf..d2e34d328c90 100644
--- a/gnu/lib/libdialog/TESTS/yesno.c
+++ b/gnu/lib/libdialog/TESTS/yesno.c
@@ -13,7 +13,7 @@
  * the author assume any responsibility for damages incurred with
  * its use.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/gnu/lib/libdialog/dialog.3 b/gnu/lib/libdialog/dialog.3
index f17c172538d9..8e6601b8fcd9 100644
--- a/gnu/lib/libdialog/dialog.3
+++ b/gnu/lib/libdialog/dialog.3
@@ -11,7 +11,7 @@
 .\" nor does the author assume any responsibility for damages incurred with
 .\" its use.
 .\"
-.\" $Id: dialog.3,v 1.9 1999/03/05 14:43:29 bde Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 2, 1998
 .Dt DIALOG 3
diff --git a/gnu/lib/libg++/Makefile b/gnu/lib/libg++/Makefile
index 712789253d8b..6d9fc509b9d0 100644
--- a/gnu/lib/libg++/Makefile
+++ b/gnu/lib/libg++/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.20 1997/05/23 08:33:55 asami Exp $
+# $FreeBSD$
 #
 
 GPPDIR=	${.CURDIR}/../../../contrib/libg++
diff --git a/gnu/lib/libg++/doc/Makefile b/gnu/lib/libg++/doc/Makefile
index 753ea8e220ca..1d275ea0c26a 100644
--- a/gnu/lib/libg++/doc/Makefile
+++ b/gnu/lib/libg++/doc/Makefile
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 
 INFO = g++FAQ libg++ iostream
 INFOSECTION= "Gcc Documentation"
diff --git a/gnu/lib/libg2c/Makefile b/gnu/lib/libg2c/Makefile
index 3dbe9e88ba09..6a6837cb2aa2 100644
--- a/gnu/lib/libg2c/Makefile
+++ b/gnu/lib/libg2c/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1999/05/23 10:02:46 obrien Exp $
+# $FreeBSD$
 
 SRCDIR=	${.CURDIR}/../../../contrib/egcs/libf2c
 
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index 30ce6e0e40df..5727e759019b 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.25 1999/04/08 08:39:16 obrien Exp $
+# $FreeBSD$
 
 GCCDIR=	${.CURDIR}/../../../contrib/egcs/gcc
 
diff --git a/gnu/lib/libgcc_r/Makefile b/gnu/lib/libgcc_r/Makefile
index 7a20f5a1f583..6428ebab1219 100644
--- a/gnu/lib/libgcc_r/Makefile
+++ b/gnu/lib/libgcc_r/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/04/14 00:24:03 obrien Exp $
+# $FreeBSD$
 
 .include "../libgcc/Makefile"
 
diff --git a/gnu/lib/libgmp/Makefile b/gnu/lib/libgmp/Makefile
index 37e390f392c3..12b9b8cdaf40 100644
--- a/gnu/lib/libgmp/Makefile
+++ b/gnu/lib/libgmp/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.20 1998/12/16 04:59:53 imp Exp $
+# $FreeBSD$
 #
 
 LIB=	gmp
diff --git a/gnu/lib/libgmp/Makefile.inc b/gnu/lib/libgmp/Makefile.inc
index b60fe3c7b171..f433aca6d22a 100644
--- a/gnu/lib/libgmp/Makefile.inc
+++ b/gnu/lib/libgmp/Makefile.inc
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 
 SHLIB_MAJOR=	3
diff --git a/gnu/lib/libgmp/doc/Makefile b/gnu/lib/libgmp/doc/Makefile
index dde32e5551fe..afe15d1068ce 100644
--- a/gnu/lib/libgmp/doc/Makefile
+++ b/gnu/lib/libgmp/doc/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 INFO = gmp
 INFOSECTION= "Programming & development tools."
diff --git a/gnu/lib/libmp/Makefile b/gnu/lib/libmp/Makefile
index 5f922d26d9a4..8a37ed83490c 100644
--- a/gnu/lib/libmp/Makefile
+++ b/gnu/lib/libmp/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.16 1998/08/30 01:57:55 jb Exp $
+# $FreeBSD$
 #
 
 LIB=	mp
diff --git a/gnu/lib/libobjc/Makefile b/gnu/lib/libobjc/Makefile
index c5a20d14da16..7e7b4ca1f13d 100644
--- a/gnu/lib/libobjc/Makefile
+++ b/gnu/lib/libobjc/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.6 1999/04/06 13:26:48 obrien Exp $
+# $FreeBSD$
 
 GCCDIR=	${.CURDIR}/../../../contrib/egcs/gcc
 
diff --git a/gnu/lib/libreadline/Makefile b/gnu/lib/libreadline/Makefile
index 4f54df49dd8f..31650321000b 100644
--- a/gnu/lib/libreadline/Makefile
+++ b/gnu/lib/libreadline/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.31 1999/05/28 04:25:45 ache Exp $
+# $FreeBSD$
 
 SUBDIR = history readline
 
diff --git a/gnu/lib/libreadline/Makefile.inc b/gnu/lib/libreadline/Makefile.inc
index 755ef7fe90bc..0dd7746254d0 100644
--- a/gnu/lib/libreadline/Makefile.inc
+++ b/gnu/lib/libreadline/Makefile.inc
@@ -1,4 +1,4 @@
-#       $Id: Makefile.inc,v 1.1 1999/05/28 04:25:47 ache Exp $
+# $FreeBSD$
 
 SHLIB_MAJOR= 3
 SHLIB_MINOR= 0
diff --git a/gnu/lib/libreadline/history/Makefile b/gnu/lib/libreadline/history/Makefile
index abfd31465f94..7d225128c3d6 100644
--- a/gnu/lib/libreadline/history/Makefile
+++ b/gnu/lib/libreadline/history/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.1 1999/05/28 04:26:11 ache Exp $
+# $FreeBSD$
 
 SUBDIR= doc
 
diff --git a/gnu/lib/libreadline/history/doc/Makefile b/gnu/lib/libreadline/history/doc/Makefile
index 874822f5517f..4fdf229fc98d 100644
--- a/gnu/lib/libreadline/history/doc/Makefile
+++ b/gnu/lib/libreadline/history/doc/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 1997/02/22 15:43:06 peter Exp $
+# $FreeBSD$
 
 SRCDIR= ${.CURDIR}/../../../../../contrib/libreadline/doc
 
diff --git a/gnu/lib/libreadline/readline/Makefile b/gnu/lib/libreadline/readline/Makefile
index c771690e54fd..e539fb802f7a 100644
--- a/gnu/lib/libreadline/readline/Makefile
+++ b/gnu/lib/libreadline/readline/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.1 1999/05/28 04:26:15 ache Exp $
+# $FreeBSD$
 
 SUBDIR= doc
 
diff --git a/gnu/lib/libreadline/readline/doc/Makefile b/gnu/lib/libreadline/readline/doc/Makefile
index 5b8fad288b26..a65e339f554a 100644
--- a/gnu/lib/libreadline/readline/doc/Makefile
+++ b/gnu/lib/libreadline/readline/doc/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 1997/02/22 15:43:07 peter Exp $
+# $FreeBSD$
 
 SRCDIR= ${.CURDIR}/../../../../../contrib/libreadline/doc
 
diff --git a/gnu/lib/libregex/test/Makefile b/gnu/lib/libregex/test/Makefile
index 977c5d291851..218d2a1da2a1 100644
--- a/gnu/lib/libregex/test/Makefile
+++ b/gnu/lib/libregex/test/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 # Generated automatically from Makefile.in by configure.
 # Makefile for regex testing.
diff --git a/gnu/lib/libregex/test/Makefile.in b/gnu/lib/libregex/test/Makefile.in
index 7b56b32c1ba8..80ec09cfed36 100644
--- a/gnu/lib/libregex/test/Makefile.in
+++ b/gnu/lib/libregex/test/Makefile.in
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 # Makefile for regex testing.
 #
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
index f5c32c572ccd..28fa9d4b479c 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.21 1999/04/25 16:59:54 obrien Exp $
+# $FreeBSD$
 
 SRCDIR=	${.CURDIR}/../../../contrib/egcs/libstdc++
 
diff --git a/gnu/lib/libstdc++/doc/Makefile b/gnu/lib/libstdc++/doc/Makefile
index aafa2fb71c41..3992c2043479 100644
--- a/gnu/lib/libstdc++/doc/Makefile
+++ b/gnu/lib/libstdc++/doc/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1999/04/05 10:21:30 obrien Exp $
+# $FreeBSD$
 
 SRCDIR= ${.CURDIR}/../../../../contrib/egcs/libstdc++
 
diff --git a/gnu/libexec/Makefile b/gnu/libexec/Makefile
index f90dec26d165..5d8ed2e40fef 100644
--- a/gnu/libexec/Makefile
+++ b/gnu/libexec/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 SUBDIR=	uucp
 
diff --git a/gnu/libexec/Makefile.inc b/gnu/libexec/Makefile.inc
index 1ac3dc7c91c8..829da300445d 100644
--- a/gnu/libexec/Makefile.inc
+++ b/gnu/libexec/Makefile.inc
@@ -1,3 +1,3 @@
-#	$Id$
+# $FreeBSD$
 
 BINDIR?=	/usr/libexec
diff --git a/gnu/libexec/uucp/Makefile b/gnu/libexec/uucp/Makefile
index b2b68f682ce9..23d6e1af746f 100644
--- a/gnu/libexec/uucp/Makefile
+++ b/gnu/libexec/uucp/Makefile
@@ -1,5 +1,5 @@
 # This is the Makefile for Taylor UUCP
-# $Id$
+# $FreeBSD$
 
 # subdir 'sample' called by /usr/src/etc/Makefile
 SUBDIR=		libunix libuucp libuuconf \
diff --git a/gnu/libexec/uucp/common_sources/chat.c b/gnu/libexec/uucp/common_sources/chat.c
index 8328db76aef8..589cc7da9121 100644
--- a/gnu/libexec/uucp/common_sources/chat.c
+++ b/gnu/libexec/uucp/common_sources/chat.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char chat_rcsid[] = "$Id$";
+const char chat_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/common_sources/conn.c b/gnu/libexec/uucp/common_sources/conn.c
index ddf0e9065ab9..0ba0202d4fe9 100644
--- a/gnu/libexec/uucp/common_sources/conn.c
+++ b/gnu/libexec/uucp/common_sources/conn.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char conn_rcsid[] = "$Id$";
+const char conn_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/common_sources/copy.c b/gnu/libexec/uucp/common_sources/copy.c
index 6beddc710d1a..a40276a508a2 100644
--- a/gnu/libexec/uucp/common_sources/copy.c
+++ b/gnu/libexec/uucp/common_sources/copy.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char copy_rcsid[] = "$Id$";
+const char copy_rcsid[] = "$FreeBSD$";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/common_sources/log.c b/gnu/libexec/uucp/common_sources/log.c
index 47f912a9badc..6661b3c9b5fc 100644
--- a/gnu/libexec/uucp/common_sources/log.c
+++ b/gnu/libexec/uucp/common_sources/log.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char log_rcsid[] = "$Id$";
+const char log_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/common_sources/prot.c b/gnu/libexec/uucp/common_sources/prot.c
index c821c81c615b..6661c1fa7b1f 100644
--- a/gnu/libexec/uucp/common_sources/prot.c
+++ b/gnu/libexec/uucp/common_sources/prot.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char prot_rcsid[] = "$Id$";
+const char prot_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/common_sources/util.c b/gnu/libexec/uucp/common_sources/util.c
index 0bc063b914c2..3e85af9614ba 100644
--- a/gnu/libexec/uucp/common_sources/util.c
+++ b/gnu/libexec/uucp/common_sources/util.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char util_rcsid[] = "$Id$";
+const char util_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/cu/Makefile b/gnu/libexec/uucp/cu/Makefile
index b58cd0c23155..612546df99ef 100644
--- a/gnu/libexec/uucp/cu/Makefile
+++ b/gnu/libexec/uucp/cu/Makefile
@@ -1,5 +1,5 @@
 # Makefile for cu
-# $Id$
+# $FreeBSD$
 
 BINDIR=		$(bindir)
 BINOWN=		$(owner)
diff --git a/gnu/libexec/uucp/cu/cu.1 b/gnu/libexec/uucp/cu/cu.1
index 910ab0a0b76f..81ee4df47b56 100644
--- a/gnu/libexec/uucp/cu/cu.1
+++ b/gnu/libexec/uucp/cu/cu.1
@@ -1,4 +1,4 @@
-''' $Id$
+''' $FreeBSD$
 .TH cu 1 "Taylor UUCP 1.06"
 .SH NAME
 cu \- Call up another system
diff --git a/gnu/libexec/uucp/cu/cu.c b/gnu/libexec/uucp/cu/cu.c
index eb5d4110ba05..3b41df3a28ac 100644
--- a/gnu/libexec/uucp/cu/cu.c
+++ b/gnu/libexec/uucp/cu/cu.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char cu_rcsid[] = "$Id$";
+const char cu_rcsid[] = "$FreeBSD$";
 #endif
 
 #include "cu.h"
diff --git a/gnu/libexec/uucp/libunix/Makefile b/gnu/libexec/uucp/libunix/Makefile
index acdb62e3cf0d..750521e33f29 100644
--- a/gnu/libexec/uucp/libunix/Makefile
+++ b/gnu/libexec/uucp/libunix/Makefile
@@ -1,5 +1,5 @@
 # This subdirectory contains Unix specific support functions.
-# $Id$
+# $FreeBSD$
 
 LIB=		unix
 SRCS = access.c addbas.c app3.c app4.c basnam.c bytfre.c corrup.c \
diff --git a/gnu/libexec/uucp/libunix/cusub.c b/gnu/libexec/uucp/libunix/cusub.c
index 503708a4caf8..c92eeba10a05 100644
--- a/gnu/libexec/uucp/libunix/cusub.c
+++ b/gnu/libexec/uucp/libunix/cusub.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char cusub_rcsid[] = "$Id$";
+const char cusub_rcsid[] = "$FreeBSD$";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/libunix/lock.c b/gnu/libexec/uucp/libunix/lock.c
index 1e2781f364ac..9740e862c1a8 100644
--- a/gnu/libexec/uucp/libunix/lock.c
+++ b/gnu/libexec/uucp/libunix/lock.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char lock_rcsid[] = "$Id$";
+const char lock_rcsid[] = "$FreeBSD$";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/libunix/picksb.c b/gnu/libexec/uucp/libunix/picksb.c
index 563748be3c14..2aacc15da568 100644
--- a/gnu/libexec/uucp/libunix/picksb.c
+++ b/gnu/libexec/uucp/libunix/picksb.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char picksb_rcsid[] = "$Id$";
+const char picksb_rcsid[] = "$FreeBSD$";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/libunix/pipe.c b/gnu/libexec/uucp/libunix/pipe.c
index 71adfa30518c..ad1ff01c9aa0 100644
--- a/gnu/libexec/uucp/libunix/pipe.c
+++ b/gnu/libexec/uucp/libunix/pipe.c
@@ -27,7 +27,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char pipe_rcsid[] = "$Id$";
+const char pipe_rcsid[] = "$FreeBSD$";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/libunix/serial.c b/gnu/libexec/uucp/libunix/serial.c
index f10be4c0503f..f5d88161cf61 100644
--- a/gnu/libexec/uucp/libunix/serial.c
+++ b/gnu/libexec/uucp/libunix/serial.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char serial_rcsid[] = "$Id$";
+const char serial_rcsid[] = "$FreeBSD$";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/libunix/spool.c b/gnu/libexec/uucp/libunix/spool.c
index 9b0fa1525318..b14b5605a093 100644
--- a/gnu/libexec/uucp/libunix/spool.c
+++ b/gnu/libexec/uucp/libunix/spool.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char spool_rcsid[] = "$Id$";
+const char spool_rcsid[] = "$FreeBSD$";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/libunix/statsb.c b/gnu/libexec/uucp/libunix/statsb.c
index 877f68654be0..4989cadc55ad 100644
--- a/gnu/libexec/uucp/libunix/statsb.c
+++ b/gnu/libexec/uucp/libunix/statsb.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char statsb_rcsid[] = "$Id$";
+const char statsb_rcsid[] = "$FreeBSD$";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/libunix/tcp.c b/gnu/libexec/uucp/libunix/tcp.c
index 428aaa1112bd..0791900d56a2 100644
--- a/gnu/libexec/uucp/libunix/tcp.c
+++ b/gnu/libexec/uucp/libunix/tcp.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char tcp_rcsid[] = "$Id$";
+const char tcp_rcsid[] = "$FreeBSD$";
 #endif
 
 #if HAVE_TCP
diff --git a/gnu/libexec/uucp/libunix/tli.c b/gnu/libexec/uucp/libunix/tli.c
index 43e02e774910..714942e5b029 100644
--- a/gnu/libexec/uucp/libunix/tli.c
+++ b/gnu/libexec/uucp/libunix/tli.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char tli_rcsid[] = "$Id$";
+const char tli_rcsid[] = "$FreeBSD$";
 #endif
 
 #if HAVE_TLI
diff --git a/gnu/libexec/uucp/libunix/work.c b/gnu/libexec/uucp/libunix/work.c
index 8734a933b089..7e0c12eb48fc 100644
--- a/gnu/libexec/uucp/libunix/work.c
+++ b/gnu/libexec/uucp/libunix/work.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char work_rcsid[] = "$Id$";
+const char work_rcsid[] = "$FreeBSD$";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/libunix/xqtfil.c b/gnu/libexec/uucp/libunix/xqtfil.c
index 5dfb6bb3e171..3019a3295db9 100644
--- a/gnu/libexec/uucp/libunix/xqtfil.c
+++ b/gnu/libexec/uucp/libunix/xqtfil.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char xqtfil_rcsid[] = "$Id$";
+const char xqtfil_rcsid[] = "$FreeBSD$";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/libunix/xqtsub.c b/gnu/libexec/uucp/libunix/xqtsub.c
index 4003b86e52cb..7435497eb631 100644
--- a/gnu/libexec/uucp/libunix/xqtsub.c
+++ b/gnu/libexec/uucp/libunix/xqtsub.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char xqtsub_rcsid[] = "$Id$";
+const char xqtsub_rcsid[] = "$FreeBSD$";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/libuuconf/Makefile b/gnu/libexec/uucp/libuuconf/Makefile
index 4fcfcde5dfc0..6fc7942a55f1 100644
--- a/gnu/libexec/uucp/libuuconf/Makefile
+++ b/gnu/libexec/uucp/libuuconf/Makefile
@@ -1,5 +1,5 @@
 # This is the Makefile for the Taylor UUCP uuconf library
-# $Id$
+# $FreeBSD$
 
 LIB=		uuconf
 SRCS = addblk.c addstr.c allblk.c alloc.c base.c bool.c callin.c \
diff --git a/gnu/libexec/uucp/libuuconf/addblk.c b/gnu/libexec/uucp/libuuconf/addblk.c
index 06c33e887f2f..3f502df302d9 100644
--- a/gnu/libexec/uucp/libuuconf/addblk.c
+++ b/gnu/libexec/uucp/libuuconf/addblk.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_addblk_rcsid[] = "$Id$";
+const char _uuconf_addblk_rcsid[] = "$FreeBSD$";
 #endif
 
 #include "alloc.h"
diff --git a/gnu/libexec/uucp/libuuconf/addstr.c b/gnu/libexec/uucp/libuuconf/addstr.c
index 9a6fbc34a59c..f95d528fddc9 100644
--- a/gnu/libexec/uucp/libuuconf/addstr.c
+++ b/gnu/libexec/uucp/libuuconf/addstr.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_addstr_rcsid[] = "$Id$";
+const char _uuconf_addstr_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/allblk.c b/gnu/libexec/uucp/libuuconf/allblk.c
index d099477594f3..045740e2f8aa 100644
--- a/gnu/libexec/uucp/libuuconf/allblk.c
+++ b/gnu/libexec/uucp/libuuconf/allblk.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_allblk_rcsid[] = "$Id$";
+const char _uuconf_allblk_rcsid[] = "$FreeBSD$";
 #endif
 
 #include "alloc.h"
diff --git a/gnu/libexec/uucp/libuuconf/alloc.c b/gnu/libexec/uucp/libuuconf/alloc.c
index fa9cd6570634..e64875a526fe 100644
--- a/gnu/libexec/uucp/libuuconf/alloc.c
+++ b/gnu/libexec/uucp/libuuconf/alloc.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_alloc_rcsid[] = "$Id$";
+const char _uuconf_alloc_rcsid[] = "$FreeBSD$";
 #endif
 
 #include "alloc.h"
diff --git a/gnu/libexec/uucp/libuuconf/base.c b/gnu/libexec/uucp/libuuconf/base.c
index a5848a6ce788..c6441230eb74 100644
--- a/gnu/libexec/uucp/libuuconf/base.c
+++ b/gnu/libexec/uucp/libuuconf/base.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_base_rcsid[] = "$Id$";
+const char _uuconf_base_rcsid[] = "$FreeBSD$";
 #endif
 
 /* This turns a cmdtab_offset table into a uuconf_cmdtab table.  Each
diff --git a/gnu/libexec/uucp/libuuconf/bool.c b/gnu/libexec/uucp/libuuconf/bool.c
index a3e1702320c9..f32c9bb5dcf2 100644
--- a/gnu/libexec/uucp/libuuconf/bool.c
+++ b/gnu/libexec/uucp/libuuconf/bool.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_bool_rcsid[] = "$Id$";
+const char _uuconf_bool_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Parse a boolean string into a variable.  This is called by
diff --git a/gnu/libexec/uucp/libuuconf/callin.c b/gnu/libexec/uucp/libuuconf/callin.c
index c7bda6af7779..e8b80adb807d 100644
--- a/gnu/libexec/uucp/libuuconf/callin.c
+++ b/gnu/libexec/uucp/libuuconf/callin.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_callin_rcsid[] = "$Id$";
+const char _uuconf_callin_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/calout.c b/gnu/libexec/uucp/libuuconf/calout.c
index 80567c12f759..26ce361fdb43 100644
--- a/gnu/libexec/uucp/libuuconf/calout.c
+++ b/gnu/libexec/uucp/libuuconf/calout.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_calout_rcsid[] = "$Id$";
+const char _uuconf_calout_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/chatc.c b/gnu/libexec/uucp/libuuconf/chatc.c
index bb1c48441d0e..bf3aed63a082 100644
--- a/gnu/libexec/uucp/libuuconf/chatc.c
+++ b/gnu/libexec/uucp/libuuconf/chatc.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_chatc_rcsid[] = "$Id$";
+const char _uuconf_chatc_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/libuuconf/cmdarg.c b/gnu/libexec/uucp/libuuconf/cmdarg.c
index 2175d98e94c7..701405c668fc 100644
--- a/gnu/libexec/uucp/libuuconf/cmdarg.c
+++ b/gnu/libexec/uucp/libuuconf/cmdarg.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_cmdarg_rcsid[] = "$Id$";
+const char _uuconf_cmdarg_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/libuuconf/cmdfil.c b/gnu/libexec/uucp/libuuconf/cmdfil.c
index d463cf1bfacf..dd5183ff5a05 100644
--- a/gnu/libexec/uucp/libuuconf/cmdfil.c
+++ b/gnu/libexec/uucp/libuuconf/cmdfil.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_cmdfil_rcsid[] = "$Id$";
+const char _uuconf_cmdfil_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/cmdlin.c b/gnu/libexec/uucp/libuuconf/cmdlin.c
index fcc95359b302..59ec08aa815d 100644
--- a/gnu/libexec/uucp/libuuconf/cmdlin.c
+++ b/gnu/libexec/uucp/libuuconf/cmdlin.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_cmdlin_rcsid[] = "$Id$";
+const char _uuconf_cmdlin_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/debfil.c b/gnu/libexec/uucp/libuuconf/debfil.c
index baf5b0622021..6d4c0cb8d05a 100644
--- a/gnu/libexec/uucp/libuuconf/debfil.c
+++ b/gnu/libexec/uucp/libuuconf/debfil.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_debfil_rcsid[] = "$Id$";
+const char _uuconf_debfil_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Get the name of the UUCP debugging file.  */
diff --git a/gnu/libexec/uucp/libuuconf/deblev.c b/gnu/libexec/uucp/libuuconf/deblev.c
index 65812f05bac0..7653aeedb88c 100644
--- a/gnu/libexec/uucp/libuuconf/deblev.c
+++ b/gnu/libexec/uucp/libuuconf/deblev.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_deblev_rcsid[] = "$Id$";
+const char _uuconf_deblev_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Get the UUCP debugging level.  */
diff --git a/gnu/libexec/uucp/libuuconf/diacod.c b/gnu/libexec/uucp/libuuconf/diacod.c
index a557e57d7666..df0e9a7beec0 100644
--- a/gnu/libexec/uucp/libuuconf/diacod.c
+++ b/gnu/libexec/uucp/libuuconf/diacod.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_diacod_rcsid[] = "$Id$";
+const char _uuconf_diacod_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/dial.c b/gnu/libexec/uucp/libuuconf/dial.c
index 0d71c5ef18e6..7b84416b77d0 100644
--- a/gnu/libexec/uucp/libuuconf/dial.c
+++ b/gnu/libexec/uucp/libuuconf/dial.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_dial_rcsid[] = "$Id$";
+const char _uuconf_dial_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Find a dialer by name.  */
diff --git a/gnu/libexec/uucp/libuuconf/diasub.c b/gnu/libexec/uucp/libuuconf/diasub.c
index 6988ca604fe3..80358cc26af8 100644
--- a/gnu/libexec/uucp/libuuconf/diasub.c
+++ b/gnu/libexec/uucp/libuuconf/diasub.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_diasub_rcsid[] = "$Id$";
+const char _uuconf_diasub_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Clear the information in a dialer.  */
diff --git a/gnu/libexec/uucp/libuuconf/dnams.c b/gnu/libexec/uucp/libuuconf/dnams.c
index d2915014b947..2d295e6aaaf2 100644
--- a/gnu/libexec/uucp/libuuconf/dnams.c
+++ b/gnu/libexec/uucp/libuuconf/dnams.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_dnams_rcsid[] = "$Id$";
+const char _uuconf_dnams_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Get all known dialer names.  */
diff --git a/gnu/libexec/uucp/libuuconf/errno.c b/gnu/libexec/uucp/libuuconf/errno.c
index e9b7761f39b2..129c4a4b88b7 100644
--- a/gnu/libexec/uucp/libuuconf/errno.c
+++ b/gnu/libexec/uucp/libuuconf/errno.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_errno_rcsid[] = "$Id$";
+const char _uuconf_errno_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/errstr.c b/gnu/libexec/uucp/libuuconf/errstr.c
index 7782787a4043..d5370c963ec8 100644
--- a/gnu/libexec/uucp/libuuconf/errstr.c
+++ b/gnu/libexec/uucp/libuuconf/errstr.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_errstr_rcsid[] = "$Id$";
+const char _uuconf_errstr_rcsid[] = "$FreeBSD$";
 #endif
 
 static char *zeprint_num P((char *zbuf, size_t cbuf, int ival));
diff --git a/gnu/libexec/uucp/libuuconf/filnam.c b/gnu/libexec/uucp/libuuconf/filnam.c
index 605709320161..55c23b75ec18 100644
--- a/gnu/libexec/uucp/libuuconf/filnam.c
+++ b/gnu/libexec/uucp/libuuconf/filnam.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_filnam_rcsid[] = "$Id$";
+const char _uuconf_filnam_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Return the saved file name.  */
diff --git a/gnu/libexec/uucp/libuuconf/freblk.c b/gnu/libexec/uucp/libuuconf/freblk.c
index 6d5281c778e9..df01897e29a3 100644
--- a/gnu/libexec/uucp/libuuconf/freblk.c
+++ b/gnu/libexec/uucp/libuuconf/freblk.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_freblk_rcsid[] = "$Id$";
+const char _uuconf_freblk_rcsid[] = "$FreeBSD$";
 #endif
 
 #include "alloc.h"
diff --git a/gnu/libexec/uucp/libuuconf/fredia.c b/gnu/libexec/uucp/libuuconf/fredia.c
index 5281acfaea00..c1f8f46786b0 100644
--- a/gnu/libexec/uucp/libuuconf/fredia.c
+++ b/gnu/libexec/uucp/libuuconf/fredia.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_fredia_rcsid[] = "$Id$";
+const char _uuconf_fredia_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Free the memory allocated for a dialer.  */
diff --git a/gnu/libexec/uucp/libuuconf/free.c b/gnu/libexec/uucp/libuuconf/free.c
index 4bad8bdad736..c31f337925e8 100644
--- a/gnu/libexec/uucp/libuuconf/free.c
+++ b/gnu/libexec/uucp/libuuconf/free.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_free_rcsid[] = "$Id$";
+const char _uuconf_free_rcsid[] = "$FreeBSD$";
 #endif
 
 #include "alloc.h"
diff --git a/gnu/libexec/uucp/libuuconf/freprt.c b/gnu/libexec/uucp/libuuconf/freprt.c
index e0529c0a68d8..265275804b31 100644
--- a/gnu/libexec/uucp/libuuconf/freprt.c
+++ b/gnu/libexec/uucp/libuuconf/freprt.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_freprt_rcsid[] = "$Id$";
+const char _uuconf_freprt_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Free the memory allocated for a port.  */
diff --git a/gnu/libexec/uucp/libuuconf/fresys.c b/gnu/libexec/uucp/libuuconf/fresys.c
index 95d4fd3f7d47..a8a71cba2a7c 100644
--- a/gnu/libexec/uucp/libuuconf/fresys.c
+++ b/gnu/libexec/uucp/libuuconf/fresys.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_fresys_rcsid[] = "$Id$";
+const char _uuconf_fresys_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Free the memory allocated for a system.  */
diff --git a/gnu/libexec/uucp/libuuconf/grdcmp.c b/gnu/libexec/uucp/libuuconf/grdcmp.c
index 8f0f35b5e3b2..65b5e6311cf8 100644
--- a/gnu/libexec/uucp/libuuconf/grdcmp.c
+++ b/gnu/libexec/uucp/libuuconf/grdcmp.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_grdcmp_rcsid[] = "$Id$";
+const char _uuconf_grdcmp_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/libuuconf/hdial.c b/gnu/libexec/uucp/libuuconf/hdial.c
index 4d461059451c..6c524f8ec58c 100644
--- a/gnu/libexec/uucp/libuuconf/hdial.c
+++ b/gnu/libexec/uucp/libuuconf/hdial.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_hdial_rcsid[] = "$Id$";
+const char _uuconf_hdial_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/hdnams.c b/gnu/libexec/uucp/libuuconf/hdnams.c
index a6285d0ea71e..f02019b7ef9f 100644
--- a/gnu/libexec/uucp/libuuconf/hdnams.c
+++ b/gnu/libexec/uucp/libuuconf/hdnams.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_hdnams_rcsid[] = "$Id$";
+const char _uuconf_hdnams_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/hinit.c b/gnu/libexec/uucp/libuuconf/hinit.c
index dfd7392e86b0..5a0e32a4b291 100644
--- a/gnu/libexec/uucp/libuuconf/hinit.c
+++ b/gnu/libexec/uucp/libuuconf/hinit.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_hinit_rcsid[] = "$Id$";
+const char _uuconf_hinit_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/hlocnm.c b/gnu/libexec/uucp/libuuconf/hlocnm.c
index 2cdd60ab5898..0ede436c5f61 100644
--- a/gnu/libexec/uucp/libuuconf/hlocnm.c
+++ b/gnu/libexec/uucp/libuuconf/hlocnm.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_hlocnm_rcsid[] = "$Id$";
+const char _uuconf_hlocnm_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/hport.c b/gnu/libexec/uucp/libuuconf/hport.c
index d4e5e990a92c..23d59abe8f46 100644
--- a/gnu/libexec/uucp/libuuconf/hport.c
+++ b/gnu/libexec/uucp/libuuconf/hport.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_hport_rcsid[] = "$Id$";
+const char _uuconf_hport_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/hrmunk.c b/gnu/libexec/uucp/libuuconf/hrmunk.c
index ecfdefc2bc45..fba3af97f1f1 100644
--- a/gnu/libexec/uucp/libuuconf/hrmunk.c
+++ b/gnu/libexec/uucp/libuuconf/hrmunk.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_hrmunk_rcsid[] = "$Id$";
+const char _uuconf_hrmunk_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/hsinfo.c b/gnu/libexec/uucp/libuuconf/hsinfo.c
index 74d9919a3952..94343cc11015 100644
--- a/gnu/libexec/uucp/libuuconf/hsinfo.c
+++ b/gnu/libexec/uucp/libuuconf/hsinfo.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_hsinfo_rcsid[] = "$Id$";
+const char _uuconf_hsinfo_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/hsnams.c b/gnu/libexec/uucp/libuuconf/hsnams.c
index a459877d6392..18cec1bc0c21 100644
--- a/gnu/libexec/uucp/libuuconf/hsnams.c
+++ b/gnu/libexec/uucp/libuuconf/hsnams.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_hsnams_rcsid[] = "$Id$";
+const char _uuconf_hsnams_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/hsys.c b/gnu/libexec/uucp/libuuconf/hsys.c
index 2f9940c3486c..72254cc8a534 100644
--- a/gnu/libexec/uucp/libuuconf/hsys.c
+++ b/gnu/libexec/uucp/libuuconf/hsys.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_hsys_rcsid[] = "$Id$";
+const char _uuconf_hsys_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Get system information from the HDB configuration files.  This is a
diff --git a/gnu/libexec/uucp/libuuconf/hunk.c b/gnu/libexec/uucp/libuuconf/hunk.c
index 6d37583a0434..c829817d76de 100644
--- a/gnu/libexec/uucp/libuuconf/hunk.c
+++ b/gnu/libexec/uucp/libuuconf/hunk.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_hunk_rcsid[] = "$Id$";
+const char _uuconf_hunk_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/iniglb.c b/gnu/libexec/uucp/libuuconf/iniglb.c
index 542419307819..d0b8dd081924 100644
--- a/gnu/libexec/uucp/libuuconf/iniglb.c
+++ b/gnu/libexec/uucp/libuuconf/iniglb.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_iniglb_rcsid[] = "$Id$";
+const char _uuconf_iniglb_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/init.c b/gnu/libexec/uucp/libuuconf/init.c
index fd939d8f046a..e06c0019434e 100644
--- a/gnu/libexec/uucp/libuuconf/init.c
+++ b/gnu/libexec/uucp/libuuconf/init.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_init_rcsid[] = "$Id$";
+const char _uuconf_init_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Initialize the UUCP configuration file reading routines.  This is
diff --git a/gnu/libexec/uucp/libuuconf/int.c b/gnu/libexec/uucp/libuuconf/int.c
index 0fc39830af77..f559ec97a1e0 100644
--- a/gnu/libexec/uucp/libuuconf/int.c
+++ b/gnu/libexec/uucp/libuuconf/int.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_int_rcsid[] = "$Id$";
+const char _uuconf_int_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Parse a string into a variable.  This is called by uuconf_cmd_args,
diff --git a/gnu/libexec/uucp/libuuconf/lckdir.c b/gnu/libexec/uucp/libuuconf/lckdir.c
index 050c7a6c9ed3..cb00f12fdc80 100644
--- a/gnu/libexec/uucp/libuuconf/lckdir.c
+++ b/gnu/libexec/uucp/libuuconf/lckdir.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_lckdir_rcsid[] = "$Id$";
+const char _uuconf_lckdir_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Get the name of the UUCP lock directory.  */
diff --git a/gnu/libexec/uucp/libuuconf/lineno.c b/gnu/libexec/uucp/libuuconf/lineno.c
index 0b5d7214533f..df5ff4b18cba 100644
--- a/gnu/libexec/uucp/libuuconf/lineno.c
+++ b/gnu/libexec/uucp/libuuconf/lineno.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_lineno_rcsid[] = "$Id$";
+const char _uuconf_lineno_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Return the saved line number.  */
diff --git a/gnu/libexec/uucp/libuuconf/llocnm.c b/gnu/libexec/uucp/libuuconf/llocnm.c
index 01eab4ab5153..ce7a6a049e59 100644
--- a/gnu/libexec/uucp/libuuconf/llocnm.c
+++ b/gnu/libexec/uucp/libuuconf/llocnm.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_llocnm_rcsid[] = "$Id$";
+const char _uuconf_llocnm_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/local.c b/gnu/libexec/uucp/libuuconf/local.c
index db12322f49d8..8687f459b017 100644
--- a/gnu/libexec/uucp/libuuconf/local.c
+++ b/gnu/libexec/uucp/libuuconf/local.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_local_rcsid[] = "$Id$";
+const char _uuconf_local_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/locnm.c b/gnu/libexec/uucp/libuuconf/locnm.c
index be4bb003b6f4..3b01474ffd0b 100644
--- a/gnu/libexec/uucp/libuuconf/locnm.c
+++ b/gnu/libexec/uucp/libuuconf/locnm.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_locnm_rcsid[] = "$Id$";
+const char _uuconf_locnm_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Get the local node name.  */
diff --git a/gnu/libexec/uucp/libuuconf/logfil.c b/gnu/libexec/uucp/libuuconf/logfil.c
index 8fc7eae4b5eb..24439e2a27ce 100644
--- a/gnu/libexec/uucp/libuuconf/logfil.c
+++ b/gnu/libexec/uucp/libuuconf/logfil.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_logfil_rcsid[] = "$Id$";
+const char _uuconf_logfil_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Get the name of the UUCP log file.  */
diff --git a/gnu/libexec/uucp/libuuconf/maxuxq.c b/gnu/libexec/uucp/libuuconf/maxuxq.c
index 2285dd1704c3..909de08d5411 100644
--- a/gnu/libexec/uucp/libuuconf/maxuxq.c
+++ b/gnu/libexec/uucp/libuuconf/maxuxq.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_maxuxq_rcsid[] = "$Id$";
+const char _uuconf_maxuxq_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Get the maximum number of simultaneous uuxqt executions.  When
diff --git a/gnu/libexec/uucp/libuuconf/mrgblk.c b/gnu/libexec/uucp/libuuconf/mrgblk.c
index d3b89bdcea2d..e0dea6afe85a 100644
--- a/gnu/libexec/uucp/libuuconf/mrgblk.c
+++ b/gnu/libexec/uucp/libuuconf/mrgblk.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_mrgblk_rcsid[] = "$Id$";
+const char _uuconf_mrgblk_rcsid[] = "$FreeBSD$";
 #endif
 
 #include "alloc.h"
diff --git a/gnu/libexec/uucp/libuuconf/paramc.c b/gnu/libexec/uucp/libuuconf/paramc.c
index c88cf94f97d6..a5074d3b381b 100644
--- a/gnu/libexec/uucp/libuuconf/paramc.c
+++ b/gnu/libexec/uucp/libuuconf/paramc.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_paramc_rcsid[] = "$Id$";
+const char _uuconf_paramc_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/port.c b/gnu/libexec/uucp/libuuconf/port.c
index 8a5b6c2b8322..bb3a16fccd67 100644
--- a/gnu/libexec/uucp/libuuconf/port.c
+++ b/gnu/libexec/uucp/libuuconf/port.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_port_rcsid[] = "$Id$";
+const char _uuconf_port_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Find a port by name, baud rate, and special purpose function.  */
diff --git a/gnu/libexec/uucp/libuuconf/prtsub.c b/gnu/libexec/uucp/libuuconf/prtsub.c
index c7f0b2c9c633..667bc1c9d71c 100644
--- a/gnu/libexec/uucp/libuuconf/prtsub.c
+++ b/gnu/libexec/uucp/libuuconf/prtsub.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_prtsub_rcsid[] = "$Id$";
+const char _uuconf_prtsub_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Clear the information in a port.  This can only clear the type
diff --git a/gnu/libexec/uucp/libuuconf/pubdir.c b/gnu/libexec/uucp/libuuconf/pubdir.c
index 48ebca1320ea..5192c6246df2 100644
--- a/gnu/libexec/uucp/libuuconf/pubdir.c
+++ b/gnu/libexec/uucp/libuuconf/pubdir.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_pubdir_rcsid[] = "$Id$";
+const char _uuconf_pubdir_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Get the name of the UUCP public directory.  */
diff --git a/gnu/libexec/uucp/libuuconf/rdlocs.c b/gnu/libexec/uucp/libuuconf/rdlocs.c
index 52d0ae962815..3baabc251df2 100644
--- a/gnu/libexec/uucp/libuuconf/rdlocs.c
+++ b/gnu/libexec/uucp/libuuconf/rdlocs.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_rdlocs_rcsid[] = "$Id$";
+const char _uuconf_rdlocs_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/rdperm.c b/gnu/libexec/uucp/libuuconf/rdperm.c
index 9860a80c1233..a7d29a41b63b 100644
--- a/gnu/libexec/uucp/libuuconf/rdperm.c
+++ b/gnu/libexec/uucp/libuuconf/rdperm.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_rdperm_rcsid[] = "$Id$";
+const char _uuconf_rdperm_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/reliab.c b/gnu/libexec/uucp/libuuconf/reliab.c
index ac4c6d869113..8a232cd1253f 100644
--- a/gnu/libexec/uucp/libuuconf/reliab.c
+++ b/gnu/libexec/uucp/libuuconf/reliab.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_reliab_rcsid[] = "$Id$";
+const char _uuconf_reliab_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Handle the "seven-bit" command for a port or a dialer.  The pvar
diff --git a/gnu/libexec/uucp/libuuconf/remunk.c b/gnu/libexec/uucp/libuuconf/remunk.c
index 28b841044ebf..8dc83d713a7f 100644
--- a/gnu/libexec/uucp/libuuconf/remunk.c
+++ b/gnu/libexec/uucp/libuuconf/remunk.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_remunk_rcsid[] = "$Id$";
+const char _uuconf_remunk_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Get the name of the remote.unknown shell script.  */
diff --git a/gnu/libexec/uucp/libuuconf/runuxq.c b/gnu/libexec/uucp/libuuconf/runuxq.c
index b7991ea94341..0c5296cbf613 100644
--- a/gnu/libexec/uucp/libuuconf/runuxq.c
+++ b/gnu/libexec/uucp/libuuconf/runuxq.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_runuxq_rcsid[] = "$Id$";
+const char _uuconf_runuxq_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Return how often to spawn a uuxqt process.  This is either a
diff --git a/gnu/libexec/uucp/libuuconf/sinfo.c b/gnu/libexec/uucp/libuuconf/sinfo.c
index dab8b90ebbbc..fe7b7b972731 100644
--- a/gnu/libexec/uucp/libuuconf/sinfo.c
+++ b/gnu/libexec/uucp/libuuconf/sinfo.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_sinfo_rcsid[] = "$Id$";
+const char _uuconf_sinfo_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Get information about a particular system.  We combine the
diff --git a/gnu/libexec/uucp/libuuconf/snams.c b/gnu/libexec/uucp/libuuconf/snams.c
index 4c521de8c698..f648e61a6d0f 100644
--- a/gnu/libexec/uucp/libuuconf/snams.c
+++ b/gnu/libexec/uucp/libuuconf/snams.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_snams_rcsid[] = "$Id$";
+const char _uuconf_snams_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Get all known system names.  */
diff --git a/gnu/libexec/uucp/libuuconf/split.c b/gnu/libexec/uucp/libuuconf/split.c
index abc5ea5362c4..8b90a660d682 100644
--- a/gnu/libexec/uucp/libuuconf/split.c
+++ b/gnu/libexec/uucp/libuuconf/split.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_split_rcsid[] = "$Id$";
+const char _uuconf_split_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/libuuconf/spool.c b/gnu/libexec/uucp/libuuconf/spool.c
index c081a785d849..0fe073334c90 100644
--- a/gnu/libexec/uucp/libuuconf/spool.c
+++ b/gnu/libexec/uucp/libuuconf/spool.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_spool_rcsid[] = "$Id$";
+const char _uuconf_spool_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Get the name of the UUCP spool directory.  */
diff --git a/gnu/libexec/uucp/libuuconf/stafil.c b/gnu/libexec/uucp/libuuconf/stafil.c
index 5b9fa7eab115..205e05c7bb89 100644
--- a/gnu/libexec/uucp/libuuconf/stafil.c
+++ b/gnu/libexec/uucp/libuuconf/stafil.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_stafil_rcsid[] = "$Id$";
+const char _uuconf_stafil_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Get the name of the UUCP statistics file.  */
diff --git a/gnu/libexec/uucp/libuuconf/strip.c b/gnu/libexec/uucp/libuuconf/strip.c
index 73fbd9301cd6..03f962bf1da4 100644
--- a/gnu/libexec/uucp/libuuconf/strip.c
+++ b/gnu/libexec/uucp/libuuconf/strip.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_strip_rcsid[] = "$Id$";
+const char _uuconf_strip_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Get information about what types of global information should be
diff --git a/gnu/libexec/uucp/libuuconf/syssub.c b/gnu/libexec/uucp/libuuconf/syssub.c
index 9f875c9aafb5..81b0dd84e651 100644
--- a/gnu/libexec/uucp/libuuconf/syssub.c
+++ b/gnu/libexec/uucp/libuuconf/syssub.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_syssub_rcsid[] = "$Id$";
+const char _uuconf_syssub_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/tcalou.c b/gnu/libexec/uucp/libuuconf/tcalou.c
index 2caaeb74191a..8ff0493bde54 100644
--- a/gnu/libexec/uucp/libuuconf/tcalou.c
+++ b/gnu/libexec/uucp/libuuconf/tcalou.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tcalou_rcsid[] = "$Id$";
+const char _uuconf_tcalou_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/tdial.c b/gnu/libexec/uucp/libuuconf/tdial.c
index e7ffc0c4cc45..1bf57d240fb3 100644
--- a/gnu/libexec/uucp/libuuconf/tdial.c
+++ b/gnu/libexec/uucp/libuuconf/tdial.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tdial_rcsid[] = "$Id$";
+const char _uuconf_tdial_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/tdialc.c b/gnu/libexec/uucp/libuuconf/tdialc.c
index 26d7823eb5a9..c13a7a5d2c43 100644
--- a/gnu/libexec/uucp/libuuconf/tdialc.c
+++ b/gnu/libexec/uucp/libuuconf/tdialc.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tdialc_rcsid[] = "$Id$";
+const char _uuconf_tdialc_rcsid[] = "$FreeBSD$";
 #endif
 
 static int idchat P((pointer pglobal, int argc, char **argv, pointer pvar,
diff --git a/gnu/libexec/uucp/libuuconf/tdnams.c b/gnu/libexec/uucp/libuuconf/tdnams.c
index 21e0d45c1a17..38e30070bb83 100644
--- a/gnu/libexec/uucp/libuuconf/tdnams.c
+++ b/gnu/libexec/uucp/libuuconf/tdnams.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tdnams_rcsid[] = "$Id$";
+const char _uuconf_tdnams_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/tgcmp.c b/gnu/libexec/uucp/libuuconf/tgcmp.c
index 23ae36b3e2cb..16f2a2c229c6 100644
--- a/gnu/libexec/uucp/libuuconf/tgcmp.c
+++ b/gnu/libexec/uucp/libuuconf/tgcmp.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tgcmp_rcsid[] = "$Id$";
+const char _uuconf_tgcmp_rcsid[] = "$FreeBSD$";
 #endif
 
 /* A comparison function to pass to _uuconf_itime_parse.  This
diff --git a/gnu/libexec/uucp/libuuconf/thread.c b/gnu/libexec/uucp/libuuconf/thread.c
index 65d750cd71c3..23af8ebe8bcc 100644
--- a/gnu/libexec/uucp/libuuconf/thread.c
+++ b/gnu/libexec/uucp/libuuconf/thread.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_thread_rcsid[] = "$Id$";
+const char _uuconf_thread_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/time.c b/gnu/libexec/uucp/libuuconf/time.c
index 172013b9abeb..db00d6a993e3 100644
--- a/gnu/libexec/uucp/libuuconf/time.c
+++ b/gnu/libexec/uucp/libuuconf/time.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_time_rcsid[] = "$Id$";
+const char _uuconf_time_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/libuuconf/tinit.c b/gnu/libexec/uucp/libuuconf/tinit.c
index 2e501dd44dee..6ab9869d285e 100644
--- a/gnu/libexec/uucp/libuuconf/tinit.c
+++ b/gnu/libexec/uucp/libuuconf/tinit.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tinit_rcsid[] = "$Id$";
+const char _uuconf_tinit_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/tlocnm.c b/gnu/libexec/uucp/libuuconf/tlocnm.c
index 93f53b828ce4..96280acdbc44 100644
--- a/gnu/libexec/uucp/libuuconf/tlocnm.c
+++ b/gnu/libexec/uucp/libuuconf/tlocnm.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tlocnm_rcsid[] = "$Id$";
+const char _uuconf_tlocnm_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/tport.c b/gnu/libexec/uucp/libuuconf/tport.c
index cc350f295f2c..3e052f375382 100644
--- a/gnu/libexec/uucp/libuuconf/tport.c
+++ b/gnu/libexec/uucp/libuuconf/tport.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tport_rcsid[] = "$Id$";
+const char _uuconf_tport_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/tportc.c b/gnu/libexec/uucp/libuuconf/tportc.c
index a2b845aa4252..b07d49a15f95 100644
--- a/gnu/libexec/uucp/libuuconf/tportc.c
+++ b/gnu/libexec/uucp/libuuconf/tportc.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tportc_rcsid[] = "$Id$";
+const char _uuconf_tportc_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/tsinfo.c b/gnu/libexec/uucp/libuuconf/tsinfo.c
index 2fe073c12190..6766153f5203 100644
--- a/gnu/libexec/uucp/libuuconf/tsinfo.c
+++ b/gnu/libexec/uucp/libuuconf/tsinfo.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tsinfo_rcsid[] = "$Id$";
+const char _uuconf_tsinfo_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/tsnams.c b/gnu/libexec/uucp/libuuconf/tsnams.c
index 16fb2fd06934..a60b3c7e120c 100644
--- a/gnu/libexec/uucp/libuuconf/tsnams.c
+++ b/gnu/libexec/uucp/libuuconf/tsnams.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tsnams_rcsid[] = "$Id$";
+const char _uuconf_tsnams_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Get all the system names from the Taylor UUCP configuration files.
diff --git a/gnu/libexec/uucp/libuuconf/tsys.c b/gnu/libexec/uucp/libuuconf/tsys.c
index 04c80acc462a..bdb90a2f5c72 100644
--- a/gnu/libexec/uucp/libuuconf/tsys.c
+++ b/gnu/libexec/uucp/libuuconf/tsys.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tsys_rcsid[] = "$Id$";
+const char _uuconf_tsys_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Get system information from the Taylor UUCP configuration files.
diff --git a/gnu/libexec/uucp/libuuconf/tval.c b/gnu/libexec/uucp/libuuconf/tval.c
index 0b743d723cd3..c0a25351a318 100644
--- a/gnu/libexec/uucp/libuuconf/tval.c
+++ b/gnu/libexec/uucp/libuuconf/tval.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_tval_rcsid[] = "$Id$";
+const char _uuconf_tval_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Validate a login name for a system using Taylor UUCP configuration
diff --git a/gnu/libexec/uucp/libuuconf/ugtlin.c b/gnu/libexec/uucp/libuuconf/ugtlin.c
index 50850292c293..a328229759ad 100644
--- a/gnu/libexec/uucp/libuuconf/ugtlin.c
+++ b/gnu/libexec/uucp/libuuconf/ugtlin.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_ugtlin_rcsid[] = "$Id$";
+const char _uuconf_ugtlin_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Read a line from a file with backslash continuations.  This updates
diff --git a/gnu/libexec/uucp/libuuconf/unk.c b/gnu/libexec/uucp/libuuconf/unk.c
index 3a9e294c14b3..6345ffed9cb3 100644
--- a/gnu/libexec/uucp/libuuconf/unk.c
+++ b/gnu/libexec/uucp/libuuconf/unk.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_unk_rcsid[] = "$Id$";
+const char _uuconf_unk_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/val.c b/gnu/libexec/uucp/libuuconf/val.c
index de5b76dcff55..1ef0182a27ec 100644
--- a/gnu/libexec/uucp/libuuconf/val.c
+++ b/gnu/libexec/uucp/libuuconf/val.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_val_rcsid[] = "$Id$";
+const char _uuconf_val_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Validate a login name for a system.  */
diff --git a/gnu/libexec/uucp/libuuconf/vinit.c b/gnu/libexec/uucp/libuuconf/vinit.c
index d671b21110ad..e1552c30cefe 100644
--- a/gnu/libexec/uucp/libuuconf/vinit.c
+++ b/gnu/libexec/uucp/libuuconf/vinit.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_vinit_rcsid[] = "$Id$";
+const char _uuconf_vinit_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/vport.c b/gnu/libexec/uucp/libuuconf/vport.c
index c2d979122a28..1e39d2d647b7 100644
--- a/gnu/libexec/uucp/libuuconf/vport.c
+++ b/gnu/libexec/uucp/libuuconf/vport.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_vport_rcsid[] = "$Id$";
+const char _uuconf_vport_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/vsinfo.c b/gnu/libexec/uucp/libuuconf/vsinfo.c
index 85bdcadc6748..4ca8005b7e07 100644
--- a/gnu/libexec/uucp/libuuconf/vsinfo.c
+++ b/gnu/libexec/uucp/libuuconf/vsinfo.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_vsinfo_rcsid[] = "$Id$";
+const char _uuconf_vsinfo_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/vsnams.c b/gnu/libexec/uucp/libuuconf/vsnams.c
index 0f165eecebe0..432c9bf9a998 100644
--- a/gnu/libexec/uucp/libuuconf/vsnams.c
+++ b/gnu/libexec/uucp/libuuconf/vsnams.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_vsnams_rcsid[] = "$Id$";
+const char _uuconf_vsnams_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/libuuconf/vsys.c b/gnu/libexec/uucp/libuuconf/vsys.c
index 8c893dc4fae3..c4431a04983a 100644
--- a/gnu/libexec/uucp/libuuconf/vsys.c
+++ b/gnu/libexec/uucp/libuuconf/vsys.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char _uuconf_vsys_rcsid[] = "$Id$";
+const char _uuconf_vsys_rcsid[] = "$FreeBSD$";
 #endif
 
 /* Get system information from the V2 configuration files.  This is a
diff --git a/gnu/libexec/uucp/libuucp/Makefile b/gnu/libexec/uucp/libuucp/Makefile
index 88ca27aa4fb6..3c4c5e94ef8f 100644
--- a/gnu/libexec/uucp/libuucp/Makefile
+++ b/gnu/libexec/uucp/libuucp/Makefile
@@ -1,5 +1,5 @@
 # This is the Makefile for the libuucp subdirectory of Taylor UUCP
-# $Id$
+# $FreeBSD$
 
 LIB=		uucp
 SRCS = buffer.c crc.c debug.c escape.c getopt.c getop1.c parse.c spool.c \
diff --git a/gnu/libexec/uucp/libuucp/parse.c b/gnu/libexec/uucp/libuucp/parse.c
index 110c00ac0402..d955e416f0cd 100644
--- a/gnu/libexec/uucp/libuucp/parse.c
+++ b/gnu/libexec/uucp/libuucp/parse.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char parse_rcsid[] = "$Id$";
+const char parse_rcsid[] = "$FreeBSD$";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/sample/Makefile b/gnu/libexec/uucp/sample/Makefile
index 897017252508..82811b3156c5 100644
--- a/gnu/libexec/uucp/sample/Makefile
+++ b/gnu/libexec/uucp/sample/Makefile
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 
 FILES=	call.sample config.sample dial.sample dialcode.sample passwd.sample \
 	port.sample sys1.sample sys2.sample
diff --git a/gnu/libexec/uucp/sample/dial.sample b/gnu/libexec/uucp/sample/dial.sample
index 5ace698a5798..4480ec5c6064 100644
--- a/gnu/libexec/uucp/sample/dial.sample
+++ b/gnu/libexec/uucp/sample/dial.sample
@@ -1,4 +1,4 @@
-#	$Id:$
+# $FreeBSD$
 
 # This is an example of dial, the dialer configuration file for Taylor
 # UUCP.  To use it, you must compile the package with
diff --git a/gnu/libexec/uucp/tstuu.c b/gnu/libexec/uucp/tstuu.c
index 60aa089c113c..b220677cae51 100644
--- a/gnu/libexec/uucp/tstuu.c
+++ b/gnu/libexec/uucp/tstuu.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char tstuu_rcsid[] = "$Id$";
+const char tstuu_rcsid[] = "$FreeBSD$";
 #endif
 
 #include "sysdep.h"
diff --git a/gnu/libexec/uucp/uuchk/Makefile b/gnu/libexec/uucp/uuchk/Makefile
index 9da46bc0239c..8af9626c7162 100644
--- a/gnu/libexec/uucp/uuchk/Makefile
+++ b/gnu/libexec/uucp/uuchk/Makefile
@@ -1,5 +1,5 @@
 # Makefile for uuchk
-# $Id: Makefile,v 1.6 1997/02/22 15:28:25 peter Exp $
+# $FreeBSD$
 
 BINDIR=		$(sbindir)
 
diff --git a/gnu/libexec/uucp/uuchk/uuchk.8 b/gnu/libexec/uucp/uuchk/uuchk.8
index c6ff00aa194a..88f7a67de171 100644
--- a/gnu/libexec/uucp/uuchk/uuchk.8
+++ b/gnu/libexec/uucp/uuchk/uuchk.8
@@ -1,4 +1,4 @@
-''' $Id: uuchk.8,v 1.1 1997/09/14 13:04:05 wosch Exp $
+''' $FreeBSD$
 .TH uuchk 1 "Taylor UUCP 1.06"
 .SH NAME
 uuchk \- displays information from the UUCP configuration
diff --git a/gnu/libexec/uucp/uuchk/uuchk.c b/gnu/libexec/uucp/uuchk/uuchk.c
index b6adc4e55d62..38c241a6ee6d 100644
--- a/gnu/libexec/uucp/uuchk/uuchk.c
+++ b/gnu/libexec/uucp/uuchk/uuchk.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char uuchk_rcsid[] = "$Id$";
+const char uuchk_rcsid[] = "$FreeBSD$";
 #endif
 
 #include "getopt.h"
diff --git a/gnu/libexec/uucp/uucico/Makefile b/gnu/libexec/uucp/uucico/Makefile
index 06a47e757861..1aa147a826c3 100644
--- a/gnu/libexec/uucp/uucico/Makefile
+++ b/gnu/libexec/uucp/uucico/Makefile
@@ -1,5 +1,5 @@
 # Makefile for uucico
-# $Id$
+# $FreeBSD$
 
 BINDIR=         $(libxdir)
 BINOWN=		$(owner)
diff --git a/gnu/libexec/uucp/uucico/prote.c b/gnu/libexec/uucp/uucico/prote.c
index a954a24e26c2..6f7032480f7d 100644
--- a/gnu/libexec/uucp/uucico/prote.c
+++ b/gnu/libexec/uucp/uucico/prote.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char prote_rcsid[] = "$Id$";
+const char prote_rcsid[] = "$FreeBSD$";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/uucico/protf.c b/gnu/libexec/uucp/uucico/protf.c
index 464d13c655ae..4436a1209c25 100644
--- a/gnu/libexec/uucp/uucico/protf.c
+++ b/gnu/libexec/uucp/uucico/protf.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char protf_rcsid[] = "$Id$";
+const char protf_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/uucico/protg.c b/gnu/libexec/uucp/uucico/protg.c
index db5233d5520a..ea589170b5fa 100644
--- a/gnu/libexec/uucp/uucico/protg.c
+++ b/gnu/libexec/uucp/uucico/protg.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char protg_rcsid[] = "$Id$";
+const char protg_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/uucico/proti.c b/gnu/libexec/uucp/uucico/proti.c
index 5f3c49da2b83..4b4c5e3ecd28 100644
--- a/gnu/libexec/uucp/uucico/proti.c
+++ b/gnu/libexec/uucp/uucico/proti.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char proti_rcsid[] = "$Id$";
+const char proti_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/uucico/protj.c b/gnu/libexec/uucp/uucico/protj.c
index 962f37862e33..bb46f72fe0b6 100644
--- a/gnu/libexec/uucp/uucico/protj.c
+++ b/gnu/libexec/uucp/uucico/protj.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char protj_rcsid[] = "$Id$";
+const char protj_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/uucico/prott.c b/gnu/libexec/uucp/uucico/prott.c
index 703fd524c8d8..fe3b274493a1 100644
--- a/gnu/libexec/uucp/uucico/prott.c
+++ b/gnu/libexec/uucp/uucico/prott.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char prott_rcsid[] = "$Id$";
+const char prott_rcsid[] = "$FreeBSD$";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/uucico/proty.c b/gnu/libexec/uucp/uucico/proty.c
index b825a7eff188..50e1f1152db3 100644
--- a/gnu/libexec/uucp/uucico/proty.c
+++ b/gnu/libexec/uucp/uucico/proty.c
@@ -23,7 +23,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char proty_id[] = "$Id$";
+const char proty_id[] = "$FreeBSD$";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/uucico/protz.c b/gnu/libexec/uucp/uucico/protz.c
index 3d0584289078..305e2507f7cf 100644
--- a/gnu/libexec/uucp/uucico/protz.c
+++ b/gnu/libexec/uucp/uucico/protz.c
@@ -181,7 +181,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char protz_rcsid[] = "$Id$";
+const char protz_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/uucico/rec.c b/gnu/libexec/uucp/uucico/rec.c
index 04fad836a848..020ff21eefd1 100644
--- a/gnu/libexec/uucp/uucico/rec.c
+++ b/gnu/libexec/uucp/uucico/rec.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char rec_rcsid[] = "$Id$";
+const char rec_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/uucico/send.c b/gnu/libexec/uucp/uucico/send.c
index db11d7599344..bbe34e582d7d 100644
--- a/gnu/libexec/uucp/uucico/send.c
+++ b/gnu/libexec/uucp/uucico/send.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char send_rcsid[] = "$Id$";
+const char send_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/uucico/time.c b/gnu/libexec/uucp/uucico/time.c
index 1f65b592d4bc..bdcb25f6e9e0 100644
--- a/gnu/libexec/uucp/uucico/time.c
+++ b/gnu/libexec/uucp/uucico/time.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char time_rcsid[] = "$Id$";
+const char time_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/uucico/trans.c b/gnu/libexec/uucp/uucico/trans.c
index b1f0e2cd9635..e7165714351d 100644
--- a/gnu/libexec/uucp/uucico/trans.c
+++ b/gnu/libexec/uucp/uucico/trans.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char trans_rcsid[] = "$Id$";
+const char trans_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/uucico/uucico.8 b/gnu/libexec/uucp/uucico/uucico.8
index b1762a9f5bac..b7918999f88f 100644
--- a/gnu/libexec/uucp/uucico/uucico.8
+++ b/gnu/libexec/uucp/uucico/uucico.8
@@ -1,4 +1,4 @@
-''' $Id$
+''' $FreeBSD$
 .TH uucico 8 "Taylor UUCP 1.06"
 .SH NAME
 uucico \- UUCP file transfer daemon
diff --git a/gnu/libexec/uucp/uucico/uucico.c b/gnu/libexec/uucp/uucico/uucico.c
index 6a6875266a6e..63b7116c72f8 100644
--- a/gnu/libexec/uucp/uucico/uucico.c
+++ b/gnu/libexec/uucp/uucico/uucico.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char uucico_rcsid[] = "$Id$";
+const char uucico_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/uucico/xcmd.c b/gnu/libexec/uucp/uucico/xcmd.c
index 18ad39a060a4..f29bb5e478d3 100644
--- a/gnu/libexec/uucp/uucico/xcmd.c
+++ b/gnu/libexec/uucp/uucico/xcmd.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char xcmd_rcsid[] = "$Id$";
+const char xcmd_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/uuconv/Makefile b/gnu/libexec/uucp/uuconv/Makefile
index 808ad864b275..02df55cc685f 100644
--- a/gnu/libexec/uucp/uuconv/Makefile
+++ b/gnu/libexec/uucp/uuconv/Makefile
@@ -1,5 +1,5 @@
 # Makefile for uuconv
-# $Id: Makefile,v 1.7 1997/02/22 15:28:37 peter Exp $
+# $FreeBSD$
 
 BINDIR=		$(sbindir)
 
diff --git a/gnu/libexec/uucp/uuconv/uuconv.1 b/gnu/libexec/uucp/uuconv/uuconv.1
index b95c9e1d4f1f..71fedc1398e9 100644
--- a/gnu/libexec/uucp/uuconv/uuconv.1
+++ b/gnu/libexec/uucp/uuconv/uuconv.1
@@ -1,4 +1,4 @@
-''' $Id: uustat.1,v 1.8 1997/02/22 15:28:49 peter Exp $
+''' $FreeBSD$
 .TH uuconv 1 "Taylor UUCP 1.06"
 .SH NAME
 uuconv \- convert UUCP configuration files
diff --git a/gnu/libexec/uucp/uuconv/uuconv.c b/gnu/libexec/uucp/uuconv/uuconv.c
index fa2d01efb22a..fadea9e20028 100644
--- a/gnu/libexec/uucp/uuconv/uuconv.c
+++ b/gnu/libexec/uucp/uuconv/uuconv.c
@@ -26,7 +26,7 @@
 #include "uucnfi.h"
 
 #if USE_RCS_ID
-const char uuconv_rcsid[] = "$Id$";
+const char uuconv_rcsid[] = "$FreeBSD$";
 #endif
 
 #include "getopt.h"
diff --git a/gnu/libexec/uucp/uucp/Makefile b/gnu/libexec/uucp/uucp/Makefile
index afd32d732fee..0219fff63a43 100644
--- a/gnu/libexec/uucp/uucp/Makefile
+++ b/gnu/libexec/uucp/uucp/Makefile
@@ -1,5 +1,5 @@
 # Makefile for uucp
-# $Id$
+# $FreeBSD$
 
 BINDIR=		$(bindir)
 BINOWN=		$(owner)
diff --git a/gnu/libexec/uucp/uucp/uucp.1 b/gnu/libexec/uucp/uucp/uucp.1
index 8cb465d91664..d8e693a5aed1 100644
--- a/gnu/libexec/uucp/uucp/uucp.1
+++ b/gnu/libexec/uucp/uucp/uucp.1
@@ -1,4 +1,4 @@
-''' $Id$
+''' $FreeBSD$
 .TH uucp 1 "Taylor UUCP 1.06"
 .SH NAME
 uucp \- Unix to Unix copy
diff --git a/gnu/libexec/uucp/uucp/uucp.c b/gnu/libexec/uucp/uucp/uucp.c
index 3ebb3d478430..080ad0f8b61d 100644
--- a/gnu/libexec/uucp/uucp/uucp.c
+++ b/gnu/libexec/uucp/uucp/uucp.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char uucp_rcsid[] = "$Id$";
+const char uucp_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/uulog/Makefile b/gnu/libexec/uucp/uulog/Makefile
index f9fd5a551e1e..9724cd515970 100644
--- a/gnu/libexec/uucp/uulog/Makefile
+++ b/gnu/libexec/uucp/uulog/Makefile
@@ -1,5 +1,5 @@
 # Makefile for uulog
-# $Id: Makefile,v 1.3 1997/02/22 15:28:41 peter Exp $
+# $FreeBSD$
 
 BINDIR=		$(bindir)
 
diff --git a/gnu/libexec/uucp/uulog/uulog.1 b/gnu/libexec/uucp/uulog/uulog.1
index 7aecaa7ddadb..315cb908aec6 100644
--- a/gnu/libexec/uucp/uulog/uulog.1
+++ b/gnu/libexec/uucp/uulog/uulog.1
@@ -1,4 +1,4 @@
-''' $Id: uulog.1,v 1.1 1997/09/14 13:04:19 wosch Exp $
+''' $FreeBSD$
 .TH uulog 1 "Taylor UUCP 1.06"
 .SH NAME
 uulog \- display UUCP log entries 
diff --git a/gnu/libexec/uucp/uulog/uulog.c b/gnu/libexec/uucp/uulog/uulog.c
index 317417211a06..440289eedbda 100644
--- a/gnu/libexec/uucp/uulog/uulog.c
+++ b/gnu/libexec/uucp/uulog/uulog.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char uulog_rcsid[] = "$Id$";
+const char uulog_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/uuname/Makefile b/gnu/libexec/uucp/uuname/Makefile
index ea701b64d76a..f5e6dd92cc85 100644
--- a/gnu/libexec/uucp/uuname/Makefile
+++ b/gnu/libexec/uucp/uuname/Makefile
@@ -1,5 +1,5 @@
 # Makefile for uuname
-# $Id: Makefile,v 1.3 1997/02/22 15:28:43 peter Exp $
+# $FreeBSD$
 
 BINDIR=		$(bindir)
 BINOWN=		$(owner)
diff --git a/gnu/libexec/uucp/uuname/uuname.1 b/gnu/libexec/uucp/uuname/uuname.1
index 3ae8e127132e..443aa9dc1e13 100644
--- a/gnu/libexec/uucp/uuname/uuname.1
+++ b/gnu/libexec/uucp/uuname/uuname.1
@@ -1,4 +1,4 @@
-''' $Id: uustat.1,v 1.8 1997/02/22 15:28:49 peter Exp $
+''' $FreeBSD$
 .TH uuname 1 "Taylor UUCP 1.06"
 .SH NAME
 uuname \- list known remote UUCP sites
diff --git a/gnu/libexec/uucp/uuname/uuname.c b/gnu/libexec/uucp/uuname/uuname.c
index 42fdc6187640..8500c33b5ad2 100644
--- a/gnu/libexec/uucp/uuname/uuname.c
+++ b/gnu/libexec/uucp/uuname/uuname.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char uuname_rcsid[] = "$Id$";
+const char uuname_rcsid[] = "$FreeBSD$";
 #endif
 
 #include "getopt.h"
diff --git a/gnu/libexec/uucp/uupick/Makefile b/gnu/libexec/uucp/uupick/Makefile
index 717dc8a9b20e..60216b806176 100644
--- a/gnu/libexec/uucp/uupick/Makefile
+++ b/gnu/libexec/uucp/uupick/Makefile
@@ -1,5 +1,5 @@
 # Makefile for uupick
-# $Id: Makefile,v 1.3 1997/02/22 15:28:45 peter Exp $
+# $FreeBSD$
 
 BINDIR=		$(bindir)
 
diff --git a/gnu/libexec/uucp/uupick/uupick.1 b/gnu/libexec/uucp/uupick/uupick.1
index 0933cbcbb98a..ebddfda38cab 100644
--- a/gnu/libexec/uucp/uupick/uupick.1
+++ b/gnu/libexec/uucp/uupick/uupick.1
@@ -1,4 +1,4 @@
-''' $Id: uustat.1,v 1.8 1997/02/22 15:28:49 peter Exp $
+''' $FreeBSD$
 .TH uupick 1 "Taylor UUCP 1.06"
 .SH NAME
 uupick \- retrieve files transferred by uuto
diff --git a/gnu/libexec/uucp/uupick/uupick.c b/gnu/libexec/uucp/uupick/uupick.c
index f34943e85626..b6d208ae8594 100644
--- a/gnu/libexec/uucp/uupick/uupick.c
+++ b/gnu/libexec/uucp/uupick/uupick.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char uupick_rcsid[] = "$Id$";
+const char uupick_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/libexec/uucp/uusched/Makefile b/gnu/libexec/uucp/uusched/Makefile
index 317710f657b6..0a203a8619fc 100644
--- a/gnu/libexec/uucp/uusched/Makefile
+++ b/gnu/libexec/uucp/uusched/Makefile
@@ -1,5 +1,5 @@
 # Makefile for uusched
-# $Id: Makefile,v 1.10 1997/02/22 15:28:46 peter Exp $
+# $FreeBSD$
 
 BINDIR=		$(bindir)
 CLEANFILES+=	$(ONESHPROG)
diff --git a/gnu/libexec/uucp/uusched/uusched.8 b/gnu/libexec/uucp/uusched/uusched.8
index c1c1508dd7b5..9621c48dcfcc 100644
--- a/gnu/libexec/uucp/uusched/uusched.8
+++ b/gnu/libexec/uucp/uusched/uusched.8
@@ -1,4 +1,4 @@
-''' $Id: uustat.1,v 1.8 1997/02/22 15:28:49 peter Exp $
+''' $FreeBSD$
 .TH uusched 8 "Taylor UUCP 1.06"
 .SH NAME
 uusched \- UUCP file transfer daemon
diff --git a/gnu/libexec/uucp/uustat/Makefile b/gnu/libexec/uucp/uustat/Makefile
index 30f4a8332681..be839ca11116 100644
--- a/gnu/libexec/uucp/uustat/Makefile
+++ b/gnu/libexec/uucp/uustat/Makefile
@@ -1,5 +1,5 @@
 # Makefile for uustat
-# $Id$
+# $FreeBSD$
 
 BINDIR=		$(bindir)
 BINOWN=		$(owner)
diff --git a/gnu/libexec/uucp/uustat/uustat.1 b/gnu/libexec/uucp/uustat/uustat.1
index 8cb7381905d6..8c30d044a599 100644
--- a/gnu/libexec/uucp/uustat/uustat.1
+++ b/gnu/libexec/uucp/uustat/uustat.1
@@ -1,4 +1,4 @@
-''' $Id$
+''' $FreeBSD$
 .TH uustat 1 "Taylor UUCP 1.06"
 .SH NAME
 uustat \- UUCP status inquiry and control
diff --git a/gnu/libexec/uucp/uustat/uustat.c b/gnu/libexec/uucp/uustat/uustat.c
index b4a29f78e13e..9ca16bbab68d 100644
--- a/gnu/libexec/uucp/uustat/uustat.c
+++ b/gnu/libexec/uucp/uustat/uustat.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char uustat_rcsid[] = "$Id$";
+const char uustat_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/libexec/uucp/uuto/Makefile b/gnu/libexec/uucp/uuto/Makefile
index d7a8e6901146..da379eef7342 100644
--- a/gnu/libexec/uucp/uuto/Makefile
+++ b/gnu/libexec/uucp/uuto/Makefile
@@ -1,5 +1,5 @@
 # Makefile for uuto
-# $Id: Makefile,v 1.8 1997/02/22 15:28:52 peter Exp $
+# $FreeBSD$
 
 BINDIR=		$(bindir)
 CLEANFILES+=	$(ONESHPROG)
diff --git a/gnu/libexec/uucp/uuto/uuto.1 b/gnu/libexec/uucp/uuto/uuto.1
index b215b99888df..13efd9292947 100644
--- a/gnu/libexec/uucp/uuto/uuto.1
+++ b/gnu/libexec/uucp/uuto/uuto.1
@@ -1,4 +1,4 @@
-''' $Id: uustat.1,v 1.8 1997/02/22 15:28:49 peter Exp $
+''' $FreeBSD$
 ''' based on the uucp texinfo documentation
 .TH uuto 1 "Taylor UUCP 1.06"
 .SH NAME
diff --git a/gnu/libexec/uucp/uux/Makefile b/gnu/libexec/uucp/uux/Makefile
index 2814b6b49853..60593523392c 100644
--- a/gnu/libexec/uucp/uux/Makefile
+++ b/gnu/libexec/uucp/uux/Makefile
@@ -1,5 +1,5 @@
 # Makefile for uux
-# $Id$
+# $FreeBSD$
 
 BINDIR=		$(bindir)
 BINOWN=		$(owner)
diff --git a/gnu/libexec/uucp/uux/uux.1 b/gnu/libexec/uucp/uux/uux.1
index ddcbcf50748e..079ff5dc428a 100644
--- a/gnu/libexec/uucp/uux/uux.1
+++ b/gnu/libexec/uucp/uux/uux.1
@@ -1,4 +1,4 @@
-''' $Id$
+''' $FreeBSD$
 .TH uux 1 "Taylor UUCP 1.06"
 .SH NAME
 uux \- Remote command execution over UUCP
diff --git a/gnu/libexec/uucp/uux/uux.c b/gnu/libexec/uucp/uux/uux.c
index cb7cdaca9acd..069e9d624d5f 100644
--- a/gnu/libexec/uucp/uux/uux.c
+++ b/gnu/libexec/uucp/uux/uux.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char uux_rcsid[] = "$Id$";
+const char uux_rcsid[] = "$FreeBSD$";
 #endif
 
 #include "uudefs.h"
diff --git a/gnu/libexec/uucp/uuxqt/Makefile b/gnu/libexec/uucp/uuxqt/Makefile
index b2777c79c72a..8c6dffa7bf13 100644
--- a/gnu/libexec/uucp/uuxqt/Makefile
+++ b/gnu/libexec/uucp/uuxqt/Makefile
@@ -1,5 +1,5 @@
 # Makefile for uuxqt
-# $Id: Makefile,v 1.8 1997/02/22 15:28:57 peter Exp $
+# $FreeBSD$
 
 BINDIR=         $(libxdir)
 BINOWN=		$(owner)
diff --git a/gnu/libexec/uucp/uuxqt/uuxqt.8 b/gnu/libexec/uucp/uuxqt/uuxqt.8
index c6996b68b982..40fe661a40e7 100644
--- a/gnu/libexec/uucp/uuxqt/uuxqt.8
+++ b/gnu/libexec/uucp/uuxqt/uuxqt.8
@@ -1,4 +1,4 @@
-''' $Id$
+''' $FreeBSD$
 .TH uuxqt 8 "Taylor UUCP 1.06"
 .SH NAME
 uuxqt \- UUCP execution daemon
diff --git a/gnu/libexec/uucp/uuxqt/uuxqt.c b/gnu/libexec/uucp/uuxqt/uuxqt.c
index 6e214734f5bd..31bcee2acfee 100644
--- a/gnu/libexec/uucp/uuxqt/uuxqt.c
+++ b/gnu/libexec/uucp/uuxqt/uuxqt.c
@@ -26,7 +26,7 @@
 #include "uucp.h"
 
 #if USE_RCS_ID
-const char uuxqt_rcsid[] = "$Id$";
+const char uuxqt_rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index ea83ccc311de..6d3dbfebf707 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.45 1999/04/05 08:48:08 obrien Exp $
+# $FreeBSD$
 
 SUBDIR= awk bc binutils bison cc cpio cvs dc dialog diff diff3 gperf \
 	grep groff gzip man patch ptx rcs sdiff send-pr sort tar texinfo
diff --git a/gnu/usr.bin/Makefile.inc b/gnu/usr.bin/Makefile.inc
index 5371a22cca25..5d2cffdd3625 100644
--- a/gnu/usr.bin/Makefile.inc
+++ b/gnu/usr.bin/Makefile.inc
@@ -1,3 +1,3 @@
-#	$Id$
+# $FreeBSD$
 
 BINDIR?=	/usr/bin
diff --git a/gnu/usr.bin/as/Makefile b/gnu/usr.bin/as/Makefile
index c7b7c1bafefc..30df8314a41b 100644
--- a/gnu/usr.bin/as/Makefile
+++ b/gnu/usr.bin/as/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	6.1 (Berkeley) 3/3/91
-#	$Id: Makefile,v 1.16 1998/09/07 05:45:23 jb Exp $
+# $FreeBSD$
 
 .include "config/Makefile.$(MACHINE_ARCH)"
 
diff --git a/gnu/usr.bin/as/Makefile.in b/gnu/usr.bin/as/Makefile.in
index b91bb3322bbf..6b3d9937def5 100644
--- a/gnu/usr.bin/as/Makefile.in
+++ b/gnu/usr.bin/as/Makefile.in
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 # Makefile for GNU Assembler
 #   Copyright (C) 1987-1992 Free Software Foundation, Inc.
diff --git a/gnu/usr.bin/as/app.c b/gnu/usr.bin/as/app.c
index 04a5e6c78573..130fb1e14db1 100644
--- a/gnu/usr.bin/as/app.c
+++ b/gnu/usr.bin/as/app.c
@@ -24,7 +24,7 @@
    pair.  This needs better error-handling.  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include <stdio.h>
diff --git a/gnu/usr.bin/as/as.1 b/gnu/usr.bin/as/as.1
index e1cb4cb81262..c7e792f82624 100644
--- a/gnu/usr.bin/as/as.1
+++ b/gnu/usr.bin/as/as.1
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1991, 1992 Free Software Foundation
 .\" See section COPYING for conditions for redistribution
-.\"	$Id$
+.\" $FreeBSD$
 .TH as 1 "21 January 1992" "cygnus support" "GNU Development Tools"
 
 .SH NAME
diff --git a/gnu/usr.bin/as/as.1aout b/gnu/usr.bin/as/as.1aout
index e1cb4cb81262..c7e792f82624 100644
--- a/gnu/usr.bin/as/as.1aout
+++ b/gnu/usr.bin/as/as.1aout
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1991, 1992 Free Software Foundation
 .\" See section COPYING for conditions for redistribution
-.\"	$Id$
+.\" $FreeBSD$
 .TH as 1 "21 January 1992" "cygnus support" "GNU Development Tools"
 
 .SH NAME
diff --git a/gnu/usr.bin/as/as.c b/gnu/usr.bin/as/as.c
index 34646938dae3..5233f33371eb 100644
--- a/gnu/usr.bin/as/as.c
+++ b/gnu/usr.bin/as/as.c
@@ -32,7 +32,7 @@
  *
  */
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include <stdio.h>
diff --git a/gnu/usr.bin/as/as.h b/gnu/usr.bin/as/as.h
index 28b6974b1bed..6b81ac92ff91 100644
--- a/gnu/usr.bin/as/as.h
+++ b/gnu/usr.bin/as/as.h
@@ -18,7 +18,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /*
- * $Id$
+ * $FreeBSD$
  */
 
 #define GAS 1
diff --git a/gnu/usr.bin/as/atof-generic.c b/gnu/usr.bin/as/atof-generic.c
index b0a8ff11ae34..f01fdb2961eb 100644
--- a/gnu/usr.bin/as/atof-generic.c
+++ b/gnu/usr.bin/as/atof-generic.c
@@ -18,7 +18,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/usr.bin/as/bignum-copy.c b/gnu/usr.bin/as/bignum-copy.c
index b212096e7e47..bb5763f35768 100644
--- a/gnu/usr.bin/as/bignum-copy.c
+++ b/gnu/usr.bin/as/bignum-copy.c
@@ -18,7 +18,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "as.h"
diff --git a/gnu/usr.bin/as/bignum.h b/gnu/usr.bin/as/bignum.h
index 71b85f8849b3..34435e2878f0 100644
--- a/gnu/usr.bin/as/bignum.h
+++ b/gnu/usr.bin/as/bignum.h
@@ -18,7 +18,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /*
- * $Id$
+ * $FreeBSD$
  */
 
 /***********************************************************************\
diff --git a/gnu/usr.bin/as/bit_fix.h b/gnu/usr.bin/as/bit_fix.h
index 3d075d76b317..5820c29c3752 100644
--- a/gnu/usr.bin/as/bit_fix.h
+++ b/gnu/usr.bin/as/bit_fix.h
@@ -18,7 +18,7 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $Id$
+ * $FreeBSD$
  */
 
 
diff --git a/gnu/usr.bin/as/cond.c b/gnu/usr.bin/as/cond.c
index 6fd46b6639a5..9fda86ff55b6 100644
--- a/gnu/usr.bin/as/cond.c
+++ b/gnu/usr.bin/as/cond.c
@@ -18,7 +18,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "as.h"
diff --git a/gnu/usr.bin/as/config/Makefile.hp300 b/gnu/usr.bin/as/config/Makefile.hp300
index 4b898204b688..981e5ca6c99b 100644
--- a/gnu/usr.bin/as/config/Makefile.hp300
+++ b/gnu/usr.bin/as/config/Makefile.hp300
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile.hp300	6.1 (Berkeley) 3/3/91
-#	$Id$
+# $FreeBSD$
 
 CFLAGS+=	-Dm68851
 SRCS+=		tc-m68k.c atof-ieee.c
diff --git a/gnu/usr.bin/as/config/Makefile.i386 b/gnu/usr.bin/as/config/Makefile.i386
index dab24592be10..79d30b3a4b37 100644
--- a/gnu/usr.bin/as/config/Makefile.i386
+++ b/gnu/usr.bin/as/config/Makefile.i386
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile.i386	6.1 (Berkeley) 3/3/91
-#	$Id$
+# $FreeBSD$
 
 CFLAGS+=	-DNON_BROKEN_WORDS -DPIC
 SRCS+=		tc-i386.c atof-ieee.c
diff --git a/gnu/usr.bin/as/config/Makefile.pc532 b/gnu/usr.bin/as/config/Makefile.pc532
index 5eb588d474f8..34d6fd30fab4 100644
--- a/gnu/usr.bin/as/config/Makefile.pc532
+++ b/gnu/usr.bin/as/config/Makefile.pc532
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 SRCS+=		tc-ns32k.c atof-ns32k.c
 
diff --git a/gnu/usr.bin/as/config/Makefile.sparc b/gnu/usr.bin/as/config/Makefile.sparc
index 25608f1d3bf2..2952077c7ef9 100644
--- a/gnu/usr.bin/as/config/Makefile.sparc
+++ b/gnu/usr.bin/as/config/Makefile.sparc
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile.i386	6.1 (Berkeley) 3/3/91
-#	$Id$
+# $FreeBSD$
 
 CFLAGS+=	-DNON_BROKEN_WORDS -DPIC
 SRCS+=		tc-sparc.c atof-ieee.c
diff --git a/gnu/usr.bin/as/config/Makefile.vax b/gnu/usr.bin/as/config/Makefile.vax
index eb2bca866427..3bdd671dcb25 100644
--- a/gnu/usr.bin/as/config/Makefile.vax
+++ b/gnu/usr.bin/as/config/Makefile.vax
@@ -1,4 +1,4 @@
 #	from: @(#)Makefile.vax	6.1 (Berkeley) 3/3/91
-#	$Id$
+# $FreeBSD$
 
 SRCS+=		tc-vax.c atof-vax.c
diff --git a/gnu/usr.bin/as/config/atof-ieee.c b/gnu/usr.bin/as/config/atof-ieee.c
index da9d73063fb3..5b5ff8571e08 100644
--- a/gnu/usr.bin/as/config/atof-ieee.c
+++ b/gnu/usr.bin/as/config/atof-ieee.c
@@ -18,7 +18,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifndef lint
-static char rcsid[] = "$Id: atof-ieee.c,v 1.7 1997/02/22 15:44:21 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "as.h"
diff --git a/gnu/usr.bin/as/config/ho-i386.h b/gnu/usr.bin/as/config/ho-i386.h
index 7e18c00e22be..949e78adc23f 100644
--- a/gnu/usr.bin/as/config/ho-i386.h
+++ b/gnu/usr.bin/as/config/ho-i386.h
@@ -17,7 +17,7 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $Id$
+ * $FreeBSD$
  */
 
 
diff --git a/gnu/usr.bin/as/config/obj-aout.h b/gnu/usr.bin/as/config/obj-aout.h
index cca03f6e5896..7f63e3b7545b 100644
--- a/gnu/usr.bin/as/config/obj-aout.h
+++ b/gnu/usr.bin/as/config/obj-aout.h
@@ -17,7 +17,7 @@
    License along with GAS; see the file COPYING.  If not, write
    to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-   $Id: obj-aout.h,v 1.7 1997/02/22 15:44:22 peter Exp $
+ $FreeBSD$
  */
 
 
diff --git a/gnu/usr.bin/as/config/tc-i386.c b/gnu/usr.bin/as/config/tc-i386.c
index c275d2faccae..133c07a6f582 100644
--- a/gnu/usr.bin/as/config/tc-i386.c
+++ b/gnu/usr.bin/as/config/tc-i386.c
@@ -25,7 +25,7 @@
   */
 
 #ifndef lint
-static char rcsid[] = "$Id: tc-i386.c,v 1.8 1997/02/22 15:44:23 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "as.h"
diff --git a/gnu/usr.bin/as/config/tc-i386.h b/gnu/usr.bin/as/config/tc-i386.h
index 0a31d4d71e81..a227895c0d97 100644
--- a/gnu/usr.bin/as/config/tc-i386.h
+++ b/gnu/usr.bin/as/config/tc-i386.h
@@ -18,7 +18,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /*
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef TC_I386
diff --git a/gnu/usr.bin/as/config/tc-sparc.c b/gnu/usr.bin/as/config/tc-sparc.c
index 5f2d6da765f2..7a14efdb4cc1 100644
--- a/gnu/usr.bin/as/config/tc-sparc.c
+++ b/gnu/usr.bin/as/config/tc-sparc.c
@@ -18,7 +18,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #define cypress 1234
diff --git a/gnu/usr.bin/as/config/tc-sparc.h b/gnu/usr.bin/as/config/tc-sparc.h
index 2a82a31963ec..5dcb72b124e9 100644
--- a/gnu/usr.bin/as/config/tc-sparc.h
+++ b/gnu/usr.bin/as/config/tc-sparc.h
@@ -18,7 +18,7 @@
    to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 /*
- * $Id$
+ * $FreeBSD$
  */
 
 #define TC_SPARC 1
diff --git a/gnu/usr.bin/as/config/te-generic.h b/gnu/usr.bin/as/config/te-generic.h
index c17f1edd9add..e7ec7084b159 100644
--- a/gnu/usr.bin/as/config/te-generic.h
+++ b/gnu/usr.bin/as/config/te-generic.h
@@ -6,7 +6,7 @@
  * compile, and copying as an aid for testing and porting.  xoxorich.
  */
 /*
- * $Id$
+ * $FreeBSD$
  */
 
 
diff --git a/gnu/usr.bin/as/debug.c b/gnu/usr.bin/as/debug.c
index dd39b96bf9a5..e91947fa8de0 100644
--- a/gnu/usr.bin/as/debug.c
+++ b/gnu/usr.bin/as/debug.c
@@ -21,7 +21,7 @@
 /* Routines for debug use only.  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "as.h"
diff --git a/gnu/usr.bin/as/expr.c b/gnu/usr.bin/as/expr.c
index d073287aed2c..c46961c94316 100644
--- a/gnu/usr.bin/as/expr.c
+++ b/gnu/usr.bin/as/expr.c
@@ -25,7 +25,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: expr.c,v 1.6 1997/02/22 15:43:31 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/usr.bin/as/expr.h b/gnu/usr.bin/as/expr.h
index 7fd97a2edc7b..ea06842444a6 100644
--- a/gnu/usr.bin/as/expr.h
+++ b/gnu/usr.bin/as/expr.h
@@ -17,7 +17,7 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $Id$
+ * $FreeBSD$
  */
 
 
diff --git a/gnu/usr.bin/as/flo-const.c b/gnu/usr.bin/as/flo-const.c
index d40185493244..51a4afc2450d 100644
--- a/gnu/usr.bin/as/flo-const.c
+++ b/gnu/usr.bin/as/flo-const.c
@@ -18,7 +18,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "flonum.h"
diff --git a/gnu/usr.bin/as/flo-copy.c b/gnu/usr.bin/as/flo-copy.c
index 54927ec85831..15a6ed4d8e79 100644
--- a/gnu/usr.bin/as/flo-copy.c
+++ b/gnu/usr.bin/as/flo-copy.c
@@ -18,7 +18,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "as.h"
diff --git a/gnu/usr.bin/as/flonum-mult.c b/gnu/usr.bin/as/flonum-mult.c
index fa377f5d7935..cb28f642d04e 100644
--- a/gnu/usr.bin/as/flonum-mult.c
+++ b/gnu/usr.bin/as/flonum-mult.c
@@ -19,7 +19,7 @@
    notice and this notice must be preserved on all copies.  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "flonum.h"
diff --git a/gnu/usr.bin/as/flonum.h b/gnu/usr.bin/as/flonum.h
index 95ea3730efcd..c0ed4165c5fe 100644
--- a/gnu/usr.bin/as/flonum.h
+++ b/gnu/usr.bin/as/flonum.h
@@ -18,7 +18,7 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $Id$
+ * $FreeBSD$
  */
 
 
diff --git a/gnu/usr.bin/as/frags.c b/gnu/usr.bin/as/frags.c
index b203abb6f455..dcdb4c5b94e9 100644
--- a/gnu/usr.bin/as/frags.c
+++ b/gnu/usr.bin/as/frags.c
@@ -19,7 +19,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "as.h"
diff --git a/gnu/usr.bin/as/frags.h b/gnu/usr.bin/as/frags.h
index 722de54c1394..287d10777623 100644
--- a/gnu/usr.bin/as/frags.h
+++ b/gnu/usr.bin/as/frags.h
@@ -18,7 +18,7 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $Id$
+ * $FreeBSD$
  */
 
 
diff --git a/gnu/usr.bin/as/hash.c b/gnu/usr.bin/as/hash.c
index 40752c90a374..dae2746e4e08 100644
--- a/gnu/usr.bin/as/hash.c
+++ b/gnu/usr.bin/as/hash.c
@@ -123,7 +123,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include <stdio.h>
diff --git a/gnu/usr.bin/as/hash.h b/gnu/usr.bin/as/hash.h
index 6325559f1a06..b6e8038fe3fc 100644
--- a/gnu/usr.bin/as/hash.h
+++ b/gnu/usr.bin/as/hash.h
@@ -17,7 +17,7 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $Id$
+ * $FreeBSD$
  */
 
 
diff --git a/gnu/usr.bin/as/hex-value.c b/gnu/usr.bin/as/hex-value.c
index 342f5eea7e5d..9b52e88b2b10 100644
--- a/gnu/usr.bin/as/hex-value.c
+++ b/gnu/usr.bin/as/hex-value.c
@@ -23,7 +23,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #define __ (42)			/* blatently illegal digit value */
diff --git a/gnu/usr.bin/as/input-file.c b/gnu/usr.bin/as/input-file.c
index ab834fd30c9c..b9bb4be3f165 100644
--- a/gnu/usr.bin/as/input-file.c
+++ b/gnu/usr.bin/as/input-file.c
@@ -25,7 +25,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #ifdef USG
diff --git a/gnu/usr.bin/as/input-file.h b/gnu/usr.bin/as/input-file.h
index ce6fcdee2ac5..73c33df5377a 100644
--- a/gnu/usr.bin/as/input-file.h
+++ b/gnu/usr.bin/as/input-file.h
@@ -20,7 +20,7 @@
 /*"input_file.c":Operating-system dependant functions to read source files.*/
 
 /*
- * $Id$
+ * $FreeBSD$
  */
 
 
diff --git a/gnu/usr.bin/as/input-scrub.c b/gnu/usr.bin/as/input-scrub.c
index 1d7cb23af602..d93d7ce01afc 100644
--- a/gnu/usr.bin/as/input-scrub.c
+++ b/gnu/usr.bin/as/input-scrub.c
@@ -18,7 +18,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include <errno.h>		/* Need this to make errno declaration right */
diff --git a/gnu/usr.bin/as/listing.c b/gnu/usr.bin/as/listing.c
index 8cfba4b6d7e7..87da713cd7b3 100644
--- a/gnu/usr.bin/as/listing.c
+++ b/gnu/usr.bin/as/listing.c
@@ -92,7 +92,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/usr.bin/as/listing.h b/gnu/usr.bin/as/listing.h
index 1e144402575d..4dece8fdb06a 100644
--- a/gnu/usr.bin/as/listing.h
+++ b/gnu/usr.bin/as/listing.h
@@ -18,7 +18,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /*
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef __listing_h__
diff --git a/gnu/usr.bin/as/makefile.dos b/gnu/usr.bin/as/makefile.dos
index c146e197f34d..2d2a9890a3b1 100644
--- a/gnu/usr.bin/as/makefile.dos
+++ b/gnu/usr.bin/as/makefile.dos
@@ -17,7 +17,7 @@
 #along with GNU GAS; see the file COPYING.  If not, write to
 #the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-# $Id$
+# $FreeBSD$
 
 # The targets for external use include:
 # all, doc, proto, install, uninstall, includes, TAGS,
diff --git a/gnu/usr.bin/as/messages.c b/gnu/usr.bin/as/messages.c
index 6c173bc291e3..1d65116db6dc 100644
--- a/gnu/usr.bin/as/messages.c
+++ b/gnu/usr.bin/as/messages.c
@@ -18,7 +18,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #ifndef lint
-static char rcsid[] = "$Id: messages.c,v 1.6 1997/02/22 15:43:40 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include <stdio.h>
diff --git a/gnu/usr.bin/as/obj.h b/gnu/usr.bin/as/obj.h
index 1c41c0552161..987e70688944 100644
--- a/gnu/usr.bin/as/obj.h
+++ b/gnu/usr.bin/as/obj.h
@@ -19,7 +19,7 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $Id$
+ * $FreeBSD$
  */
 
 
diff --git a/gnu/usr.bin/as/obstack.c b/gnu/usr.bin/as/obstack.c
index af764811e3f9..4a39b56b7568 100644
--- a/gnu/usr.bin/as/obstack.c
+++ b/gnu/usr.bin/as/obstack.c
@@ -16,7 +16,7 @@ along with this program; if not, write to the Free Software
 Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "obstack.h"
diff --git a/gnu/usr.bin/as/obstack.h b/gnu/usr.bin/as/obstack.h
index 0b3179b6676a..c1b44844bae8 100644
--- a/gnu/usr.bin/as/obstack.h
+++ b/gnu/usr.bin/as/obstack.h
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $Id$
+ * $FreeBSD$
  */
 
 
diff --git a/gnu/usr.bin/as/opcode/i386.h b/gnu/usr.bin/as/opcode/i386.h
index 2f763ffc3c95..fd482ffe9670 100644
--- a/gnu/usr.bin/as/opcode/i386.h
+++ b/gnu/usr.bin/as/opcode/i386.h
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with GAS; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-/* $Id: i386.h,v 1.8 1997/07/15 07:56:53 dyson Exp $ */
+/* $FreeBSD$ */
 
 static const template i386_optab[] = {
 
diff --git a/gnu/usr.bin/as/opcode/i960.h b/gnu/usr.bin/as/opcode/i960.h
index 7536699a1f89..20b10a8ecf69 100644
--- a/gnu/usr.bin/as/opcode/i960.h
+++ b/gnu/usr.bin/as/opcode/i960.h
@@ -18,7 +18,7 @@
  * appropriate.
  */
 
-/* $Id$ */
+/* $FreeBSD$ */
 
 #define CTRL	0
 #define COBR	1
diff --git a/gnu/usr.bin/as/opcode/sparc.h b/gnu/usr.bin/as/opcode/sparc.h
index d44f182ec4d3..cd032c256186 100644
--- a/gnu/usr.bin/as/opcode/sparc.h
+++ b/gnu/usr.bin/as/opcode/sparc.h
@@ -20,7 +20,7 @@ along with GAS or GDB; see the file COPYING.	If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.	*/
 
 /*
- * $Id$
+ * $FreeBSD$
  */
 
  /* FIXME-someday: perhaps the ,a's and such should be embedded in the
diff --git a/gnu/usr.bin/as/output-file.c b/gnu/usr.bin/as/output-file.c
index 87b4db9d3d45..0d913fd4ffa3 100644
--- a/gnu/usr.bin/as/output-file.c
+++ b/gnu/usr.bin/as/output-file.c
@@ -27,7 +27,7 @@
 /* note that we do need config info.  xoxorich. */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include <stdio.h>
diff --git a/gnu/usr.bin/as/output-file.h b/gnu/usr.bin/as/output-file.h
index 641b599c04ad..7ef1677a9601 100644
--- a/gnu/usr.bin/as/output-file.h
+++ b/gnu/usr.bin/as/output-file.h
@@ -18,7 +18,7 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $Id$
+ * $FreeBSD$
  */
 
 
diff --git a/gnu/usr.bin/as/read.c b/gnu/usr.bin/as/read.c
index 9e8db59ca835..f25f3634c9b4 100644
--- a/gnu/usr.bin/as/read.c
+++ b/gnu/usr.bin/as/read.c
@@ -19,7 +19,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #ifndef lint
-static char rcsid[] = "$Id: read.c,v 1.11 1997/04/29 02:11:48 jdp Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #define MASK_CHAR (0xFF)	/* If your chars aren't 8 bits, you will
diff --git a/gnu/usr.bin/as/read.h b/gnu/usr.bin/as/read.h
index 228dd9655a44..e396922b10b6 100644
--- a/gnu/usr.bin/as/read.h
+++ b/gnu/usr.bin/as/read.h
@@ -18,7 +18,7 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $Id$
+ * $FreeBSD$
  */
 
 
diff --git a/gnu/usr.bin/as/struc-symbol.h b/gnu/usr.bin/as/struc-symbol.h
index e6ca65ca5247..412bdfbfcd4f 100644
--- a/gnu/usr.bin/as/struc-symbol.h
+++ b/gnu/usr.bin/as/struc-symbol.h
@@ -17,7 +17,7 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $Id$
+ * $FreeBSD$
  */
 
 
diff --git a/gnu/usr.bin/as/subsegs.c b/gnu/usr.bin/as/subsegs.c
index 7501f42af64c..21ef534eb9e0 100644
--- a/gnu/usr.bin/as/subsegs.c
+++ b/gnu/usr.bin/as/subsegs.c
@@ -22,7 +22,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "as.h"
diff --git a/gnu/usr.bin/as/subsegs.h b/gnu/usr.bin/as/subsegs.h
index 9b81631afa53..0b2880485c91 100644
--- a/gnu/usr.bin/as/subsegs.h
+++ b/gnu/usr.bin/as/subsegs.h
@@ -18,7 +18,7 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $Id$
+ * $FreeBSD$
  */
 
 
diff --git a/gnu/usr.bin/as/symbols.c b/gnu/usr.bin/as/symbols.c
index 44d7105f9a37..2473af4e398a 100644
--- a/gnu/usr.bin/as/symbols.c
+++ b/gnu/usr.bin/as/symbols.c
@@ -19,7 +19,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "as.h"
diff --git a/gnu/usr.bin/as/symbols.h b/gnu/usr.bin/as/symbols.h
index edd7ff19f4f0..47916440e93c 100644
--- a/gnu/usr.bin/as/symbols.h
+++ b/gnu/usr.bin/as/symbols.h
@@ -18,7 +18,7 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $Id$
+ * $FreeBSD$
  */
 
 
diff --git a/gnu/usr.bin/as/tc.h b/gnu/usr.bin/as/tc.h
index 4641cf74d65f..e5b3938bd7d1 100644
--- a/gnu/usr.bin/as/tc.h
+++ b/gnu/usr.bin/as/tc.h
@@ -18,7 +18,7 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /*
- * $Id$
+ * $FreeBSD$
  */
 
 
diff --git a/gnu/usr.bin/as/testscripts/doboth b/gnu/usr.bin/as/testscripts/doboth
index a8c33580bb0c..6762b81af116 100755
--- a/gnu/usr.bin/as/testscripts/doboth
+++ b/gnu/usr.bin/as/testscripts/doboth
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id$
+# $FreeBSD$
 
 x=$1 ; shift
 y=$1 ; shift
diff --git a/gnu/usr.bin/as/testscripts/doobjcmp b/gnu/usr.bin/as/testscripts/doobjcmp
index 9fbe46b13f87..6297ea4116ca 100755
--- a/gnu/usr.bin/as/testscripts/doobjcmp
+++ b/gnu/usr.bin/as/testscripts/doobjcmp
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id$
+# $FreeBSD$
 # compare two object files, in depth.
 
 x=$1
diff --git a/gnu/usr.bin/as/testscripts/dostriptest b/gnu/usr.bin/as/testscripts/dostriptest
index 4b89df8d2d53..9cf54754c32d 100755
--- a/gnu/usr.bin/as/testscripts/dostriptest
+++ b/gnu/usr.bin/as/testscripts/dostriptest
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id$
+# $FreeBSD$
 
 x=striptest.xx.$$
 y=striptest.yy.$$
diff --git a/gnu/usr.bin/as/testscripts/dotest b/gnu/usr.bin/as/testscripts/dotest
index 8c7a28c6871a..677e864c819e 100755
--- a/gnu/usr.bin/as/testscripts/dotest
+++ b/gnu/usr.bin/as/testscripts/dotest
@@ -1,6 +1,6 @@
 #!/bin/sh
 # ad hoc debug tool
-# $Id$
+# $FreeBSD$
 
 x=$1
 y=$2
diff --git a/gnu/usr.bin/as/testscripts/dounsortreloc b/gnu/usr.bin/as/testscripts/dounsortreloc
index d8da0a9d6350..667ee5dff9ef 100755
--- a/gnu/usr.bin/as/testscripts/dounsortreloc
+++ b/gnu/usr.bin/as/testscripts/dounsortreloc
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id$
+# $FreeBSD$
 # objdump the reloc table, but strip off the headings and reloc
 # numbers and sort the result.  Intended for use in comparing reloc
 # tables that may not be in the same order.
diff --git a/gnu/usr.bin/as/testscripts/dounsortsymbols b/gnu/usr.bin/as/testscripts/dounsortsymbols
index 8fb6db3f8798..b9b352362685 100755
--- a/gnu/usr.bin/as/testscripts/dounsortsymbols
+++ b/gnu/usr.bin/as/testscripts/dounsortsymbols
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id$
+# $FreeBSD$
 # objdump the symbol table, but strip off the headings and symbol
 # numbers and sort the result.  Intended for use in comparing symbol
 # tables that may not be in the same order.
diff --git a/gnu/usr.bin/as/version.c b/gnu/usr.bin/as/version.c
index 569b1fffe84f..36867911d5bd 100644
--- a/gnu/usr.bin/as/version.c
+++ b/gnu/usr.bin/as/version.c
@@ -16,10 +16,10 @@ const
    */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
-char version_string[] = "GNU assembler version 1.92.3, FreeBSD $Revision: 1.5 $\n";
+char version_string[] = "GNU assembler version 1.92.3, FreeBSD $Revision: 1.6 $\n";
 
 #ifdef HO_VMS
 dummy3()
diff --git a/gnu/usr.bin/as/write.c b/gnu/usr.bin/as/write.c
index 896d6ee68ee2..835383e933ef 100644
--- a/gnu/usr.bin/as/write.c
+++ b/gnu/usr.bin/as/write.c
@@ -21,7 +21,7 @@
 /* This thing should be set up to do byteordering correctly.  But... */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "as.h"
diff --git a/gnu/usr.bin/as/xmalloc.c b/gnu/usr.bin/as/xmalloc.c
index 754ffa262b08..6c97b06511ae 100644
--- a/gnu/usr.bin/as/xmalloc.c
+++ b/gnu/usr.bin/as/xmalloc.c
@@ -42,7 +42,7 @@
   */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include <stdio.h>
diff --git a/gnu/usr.bin/as/xrealloc.c b/gnu/usr.bin/as/xrealloc.c
index 933022be71d9..72189d5d9479 100644
--- a/gnu/usr.bin/as/xrealloc.c
+++ b/gnu/usr.bin/as/xrealloc.c
@@ -43,7 +43,7 @@
   */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 
diff --git a/gnu/usr.bin/awk/Makefile b/gnu/usr.bin/awk/Makefile
index 4b6498df434b..6ba1bdb8a662 100644
--- a/gnu/usr.bin/awk/Makefile
+++ b/gnu/usr.bin/awk/Makefile
@@ -1,6 +1,6 @@
 # Makefile copyright James Raynard (jraynard@freebsd.org) 1997
 #
-# $Id: Makefile,v 1.11 1998/05/04 16:18:57 bde Exp $
+# $FreeBSD$
 
 .include "${.CURDIR}/../Makefile.inc"
 
diff --git a/gnu/usr.bin/awk/doc/Makefile b/gnu/usr.bin/awk/doc/Makefile
index 456e6e004c9a..28ee56eb7d69 100644
--- a/gnu/usr.bin/awk/doc/Makefile
+++ b/gnu/usr.bin/awk/doc/Makefile
@@ -1,6 +1,6 @@
 # Makefile copyright James Raynard (jraynard@freebsd.org) 1997
 #
-# $Id: Makefile,v 1.5 1997/10/11 17:05:07 jraynard Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../../../contrib/awk/doc
 
diff --git a/gnu/usr.bin/bc/Makefile b/gnu/usr.bin/bc/Makefile
index 75f2b99f3d66..d1aab78870da 100644
--- a/gnu/usr.bin/bc/Makefile
+++ b/gnu/usr.bin/bc/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.14 1998/05/04 16:22:30 bde Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../../contrib/bc/bc \
 	${.CURDIR}/../../../contrib/bc/lib \
diff --git a/gnu/usr.bin/binutils/Makefile b/gnu/usr.bin/binutils/Makefile
index af16d0db6cdc..60ace3d85539 100644
--- a/gnu/usr.bin/binutils/Makefile
+++ b/gnu/usr.bin/binutils/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.7 1999/05/02 16:11:43 dfr Exp $
+# $FreeBSD$
 #
 
 SUBDIR=		libiberty libbfd libopcodes libbinutils \
diff --git a/gnu/usr.bin/binutils/Makefile.inc b/gnu/usr.bin/binutils/Makefile.inc
index f39564c8d525..f314c0dff49e 100644
--- a/gnu/usr.bin/binutils/Makefile.inc
+++ b/gnu/usr.bin/binutils/Makefile.inc
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.inc,v 1.2 1998/05/04 21:13:50 jb Exp $
+# $FreeBSD$
 #
 
 BINDIR?=	/usr/libexec/elf
diff --git a/gnu/usr.bin/binutils/Makefile.inc0 b/gnu/usr.bin/binutils/Makefile.inc0
index 1dc3da830e8f..4cd487b7c97e 100644
--- a/gnu/usr.bin/binutils/Makefile.inc0
+++ b/gnu/usr.bin/binutils/Makefile.inc0
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.inc0,v 1.5 1998/09/06 23:01:49 jdp Exp $
+# $FreeBSD$
 #
 
 #
diff --git a/gnu/usr.bin/binutils/addr2line/Makefile b/gnu/usr.bin/binutils/addr2line/Makefile
index 13fac955e726..51bc7b9c2997 100644
--- a/gnu/usr.bin/binutils/addr2line/Makefile
+++ b/gnu/usr.bin/binutils/addr2line/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.1.1.1 1998/03/01 23:40:49 jdp Exp $
+# $FreeBSD$
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/ar/Makefile b/gnu/usr.bin/binutils/ar/Makefile
index a39e755f5995..6039e4b16d7d 100644
--- a/gnu/usr.bin/binutils/ar/Makefile
+++ b/gnu/usr.bin/binutils/ar/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.2 1998/03/12 02:54:55 jdp Exp $
+# $FreeBSD$
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/as/Makefile b/gnu/usr.bin/binutils/as/Makefile
index d092aa6dd227..424adff3a28f 100644
--- a/gnu/usr.bin/binutils/as/Makefile
+++ b/gnu/usr.bin/binutils/as/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.4 1998/05/11 09:31:17 jb Exp $
+# $FreeBSD$
 #
 
 .include "${.CURDIR}/../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/as/Makefile.inc b/gnu/usr.bin/binutils/as/Makefile.inc
index 95e7b36f1ea6..835b5e3c0942 100644
--- a/gnu/usr.bin/binutils/as/Makefile.inc
+++ b/gnu/usr.bin/binutils/as/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.1 1998/05/05 10:27:39 jb Exp $
+# $FreeBSD$
 
 # BINDIR
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/gnu/usr.bin/binutils/as/Makefile.inc0 b/gnu/usr.bin/binutils/as/Makefile.inc0
index 7dbc0471d9b7..25317854e071 100644
--- a/gnu/usr.bin/binutils/as/Makefile.inc0
+++ b/gnu/usr.bin/binutils/as/Makefile.inc0
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.inc0,v 1.3 1998/06/03 18:57:59 peter Exp $
+# $FreeBSD$
 #
 
 .include "${.CURDIR}/../../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/as/alpha-freebsd/Makefile b/gnu/usr.bin/binutils/as/alpha-freebsd/Makefile
index a58d93f3ea78..5d694f23c37b 100644
--- a/gnu/usr.bin/binutils/as/alpha-freebsd/Makefile
+++ b/gnu/usr.bin/binutils/as/alpha-freebsd/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.2 1998/05/05 08:56:24 jb Exp $
+# $FreeBSD$
 #
 
 .include "${.CURDIR}/../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/as/as_alpha/Makefile b/gnu/usr.bin/binutils/as/as_alpha/Makefile
index a58d93f3ea78..5d694f23c37b 100644
--- a/gnu/usr.bin/binutils/as/as_alpha/Makefile
+++ b/gnu/usr.bin/binutils/as/as_alpha/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.2 1998/05/05 08:56:24 jb Exp $
+# $FreeBSD$
 #
 
 .include "${.CURDIR}/../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/as/as_i386/Makefile b/gnu/usr.bin/binutils/as/as_i386/Makefile
index 273e27f462be..69d9639473f3 100644
--- a/gnu/usr.bin/binutils/as/as_i386/Makefile
+++ b/gnu/usr.bin/binutils/as/as_i386/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.2 1998/05/05 08:57:11 jb Exp $
+# $FreeBSD$
 #
 
 .include "${.CURDIR}/../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/as/i386-freebsd/Makefile b/gnu/usr.bin/binutils/as/i386-freebsd/Makefile
index 273e27f462be..69d9639473f3 100644
--- a/gnu/usr.bin/binutils/as/i386-freebsd/Makefile
+++ b/gnu/usr.bin/binutils/as/i386-freebsd/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.2 1998/05/05 08:57:11 jb Exp $
+# $FreeBSD$
 #
 
 .include "${.CURDIR}/../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/as/mips-freebsd/Makefile b/gnu/usr.bin/binutils/as/mips-freebsd/Makefile
index a4f7f35dd42c..b7c2461f7734 100644
--- a/gnu/usr.bin/binutils/as/mips-freebsd/Makefile
+++ b/gnu/usr.bin/binutils/as/mips-freebsd/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.1 1999/03/01 04:01:56 imp Exp $
+# $FreeBSD$
 #
 
 .include "${.CURDIR}/../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/doc/Makefile b/gnu/usr.bin/binutils/doc/Makefile
index 55ee170e8803..0669e3665270 100644
--- a/gnu/usr.bin/binutils/doc/Makefile
+++ b/gnu/usr.bin/binutils/doc/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1998/10/03 03:59:47 jdp Exp $
+# $FreeBSD$
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/gdb/Makefile b/gnu/usr.bin/binutils/gdb/Makefile
index 796c9c9b191c..37ae322d63f1 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile
+++ b/gnu/usr.bin/binutils/gdb/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/gdb/Makefile.alpha b/gnu/usr.bin/binutils/gdb/Makefile.alpha
index dc46c3ab5851..bb111056e19a 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile.alpha
+++ b/gnu/usr.bin/binutils/gdb/Makefile.alpha
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.alpha,v 1.1 1999/05/02 11:31:55 dfr Exp $
+# $FreeBSD$
 #
 
 XSRCS+= freebsd-nat.c alpha-tdep.c kvm-fbsd.c
diff --git a/gnu/usr.bin/binutils/gdb/Makefile.i386 b/gnu/usr.bin/binutils/gdb/Makefile.i386
index 364b5258e2bc..607463bded0c 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile.i386
+++ b/gnu/usr.bin/binutils/gdb/Makefile.i386
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 
 XSRCS+= freebsd-nat.c i386-tdep.c i387-tdep.c kvm-fbsd.c
diff --git a/gnu/usr.bin/binutils/gdb/gdb.1 b/gnu/usr.bin/binutils/gdb/gdb.1
index f07c89135b1d..b6cd3cc47d76 100644
--- a/gnu/usr.bin/binutils/gdb/gdb.1
+++ b/gnu/usr.bin/binutils/gdb/gdb.1
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1991 Free Software Foundation
 .\" See section COPYING for conditions for redistribution
-.\" $Id: gdb.1,v 1.3 1991/12/13 22:22:58 pesch Exp $
+.\" $FreeBSD$
 .TH gdb 1 "4nov1991" "GNU Tools" "GNU Tools"
 .SH NAME
 gdb \- The GNU Debugger
diff --git a/gnu/usr.bin/binutils/gdbreplay/Makefile b/gnu/usr.bin/binutils/gdbreplay/Makefile
index a1874a008804..7a7d3562950f 100644
--- a/gnu/usr.bin/binutils/gdbreplay/Makefile
+++ b/gnu/usr.bin/binutils/gdbreplay/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1999/05/02 19:50:17 dfr Exp $
+# $FreeBSD$
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/gdbserver/Makefile b/gnu/usr.bin/binutils/gdbserver/Makefile
index 5fef0ebe4f69..757f0f6ce0d9 100644
--- a/gnu/usr.bin/binutils/gdbserver/Makefile
+++ b/gnu/usr.bin/binutils/gdbserver/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1999/05/02 19:50:18 dfr Exp $
+# $FreeBSD$
 
 .include "../Makefile.inc0"
 
diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile
index edc42f249f04..9af66f78b311 100644
--- a/gnu/usr.bin/binutils/ld/Makefile
+++ b/gnu/usr.bin/binutils/ld/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.5 1998/06/03 18:00:49 peter Exp $
+# $FreeBSD$
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/ld/Makefile.alpha b/gnu/usr.bin/binutils/ld/Makefile.alpha
index c33129d2ab5e..6665fde445b2 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.alpha
+++ b/gnu/usr.bin/binutils/ld/Makefile.alpha
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.alpha,v 1.2 1998/05/04 21:29:54 jb Exp $
+# $FreeBSD$
 #
 
 .if	${MACHINE_ARCH} == "alpha"
diff --git a/gnu/usr.bin/binutils/ld/Makefile.i386 b/gnu/usr.bin/binutils/ld/Makefile.i386
index 52de54d4bb98..174f2110a926 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.i386
+++ b/gnu/usr.bin/binutils/ld/Makefile.i386
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.i386,v 1.3 1998/05/04 21:29:54 jb Exp $
+# $FreeBSD$
 #
 
 .if	${MACHINE_ARCH} == "i386"
diff --git a/gnu/usr.bin/binutils/ld/Makefile.mips b/gnu/usr.bin/binutils/ld/Makefile.mips
index a78cb5ba9876..fdfa80412088 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.mips
+++ b/gnu/usr.bin/binutils/ld/Makefile.mips
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.mips,v 1.1 1999/03/01 04:01:56 imp Exp $
+# $FreeBSD$
 #
 
 .if	${MACHINE_ARCH} == "mipseb"
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile b/gnu/usr.bin/binutils/libbfd/Makefile
index 0e77b6961a13..96f7065964df 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile
+++ b/gnu/usr.bin/binutils/libbfd/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.6 1998/09/06 23:01:53 jdp Exp $
+# $FreeBSD$
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.alpha b/gnu/usr.bin/binutils/libbfd/Makefile.alpha
index 7c98ead96f6e..33024a562274 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.alpha
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.alpha
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.alpha,v 1.2 1998/05/04 21:16:46 jb Exp $
+# $FreeBSD$
 #
 
 SRCS+=		coff-alpha.c cpu-alpha.c ecoff.c ecofflink.c elf64-alpha.c \
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.i386 b/gnu/usr.bin/binutils/libbfd/Makefile.i386
index b7d73470108c..ac30822f3d09 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.i386
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.i386
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.i386,v 1.4 1998/05/04 21:16:46 jb Exp $
+# $FreeBSD$
 #
 SRCS+=		cpu-i386.c elf32-i386.c elf32-target.h elf32.c elflink.c
 VECS+=		bfd_elf32_i386_vec
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile.mips b/gnu/usr.bin/binutils/libbfd/Makefile.mips
index e4c2a1b88695..68043fedc03d 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile.mips
+++ b/gnu/usr.bin/binutils/libbfd/Makefile.mips
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.i386,v 1.5 1998/06/04 06:50:58 bde Exp $
+# $FreeBSD$
 #
 SRCS+=		cpu-mips.c elf32-mips.c elf32-target.h elf32.c elflink.c
 SRCS+=		coff-mips.c ecoff.c ecofflink.c mips-opc.c mips16-opc.c
diff --git a/gnu/usr.bin/binutils/libbinutils/Makefile b/gnu/usr.bin/binutils/libbinutils/Makefile
index 660ecd7b4cb5..b6b4fa7f697b 100644
--- a/gnu/usr.bin/binutils/libbinutils/Makefile
+++ b/gnu/usr.bin/binutils/libbinutils/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.5 1998/06/04 01:09:28 bde Exp $
+# $FreeBSD$
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/libbinutils/Makefile.alpha b/gnu/usr.bin/binutils/libbinutils/Makefile.alpha
index 91193fa86f59..d214e9cfd524 100644
--- a/gnu/usr.bin/binutils/libbinutils/Makefile.alpha
+++ b/gnu/usr.bin/binutils/libbinutils/Makefile.alpha
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.i386,v 1.1 1998/03/12 02:55:30 jdp Exp $
+# $FreeBSD$
 #
 
 TARGET=		alpha-unknown-freebsdelf
diff --git a/gnu/usr.bin/binutils/libbinutils/Makefile.i386 b/gnu/usr.bin/binutils/libbinutils/Makefile.i386
index bfdd78a25c88..f52be9a2b5d6 100644
--- a/gnu/usr.bin/binutils/libbinutils/Makefile.i386
+++ b/gnu/usr.bin/binutils/libbinutils/Makefile.i386
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 
 TARGET=		i386-unknown-freebsdelf
diff --git a/gnu/usr.bin/binutils/libbinutils/Makefile.mips b/gnu/usr.bin/binutils/libbinutils/Makefile.mips
index c6cc0809530d..0ec4cdcff984 100644
--- a/gnu/usr.bin/binutils/libbinutils/Makefile.mips
+++ b/gnu/usr.bin/binutils/libbinutils/Makefile.mips
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.alpha,v 1.1 1998/03/12 08:00:03 jb Exp $
+# $FreeBSD$
 #
 
 TARGET=		${MACHINE_ARCH}-unknown-freebsdelf
diff --git a/gnu/usr.bin/binutils/libiberty/Makefile b/gnu/usr.bin/binutils/libiberty/Makefile
index e16b67867a93..7d428382eec9 100644
--- a/gnu/usr.bin/binutils/libiberty/Makefile
+++ b/gnu/usr.bin/binutils/libiberty/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.1.1.1 1998/03/01 23:41:09 jdp Exp $
+# $FreeBSD$
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile b/gnu/usr.bin/binutils/libopcodes/Makefile
index 7e046460fa3d..76448cc7a2ba 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.3 1998/03/12 05:14:19 jdp Exp $
+# $FreeBSD$
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.alpha b/gnu/usr.bin/binutils/libopcodes/Makefile.alpha
index ee6af66be846..b2f7a7912c0b 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.alpha
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.alpha
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.alpha,v 1.1 1998/03/12 13:02:46 jb Exp $
+# $FreeBSD$
 #
 
 SRCS+=		alpha-dis.c alpha-opc.c
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.amd64 b/gnu/usr.bin/binutils/libopcodes/Makefile.amd64
index 42352ec11595..96c0bc74af5b 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.amd64
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.amd64
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 
 SRCS+=		i386-dis.c
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.i386 b/gnu/usr.bin/binutils/libopcodes/Makefile.i386
index 42352ec11595..96c0bc74af5b 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.i386
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.i386
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 
 SRCS+=		i386-dis.c
diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile.mips b/gnu/usr.bin/binutils/libopcodes/Makefile.mips
index 5ac18d6d3337..380472df26c7 100644
--- a/gnu/usr.bin/binutils/libopcodes/Makefile.mips
+++ b/gnu/usr.bin/binutils/libopcodes/Makefile.mips
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.i386,v 1.1 1998/03/12 02:55:32 jdp Exp $
+# $FreeBSD$
 #
 
 SRCS+=		mips-dis.c
diff --git a/gnu/usr.bin/binutils/nm/Makefile b/gnu/usr.bin/binutils/nm/Makefile
index d3495552f2a4..2d2e263f8af5 100644
--- a/gnu/usr.bin/binutils/nm/Makefile
+++ b/gnu/usr.bin/binutils/nm/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.2 1998/03/12 02:55:34 jdp Exp $
+# $FreeBSD$
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/objcopy/Makefile b/gnu/usr.bin/binutils/objcopy/Makefile
index f9e2a29c8d7d..ca05034a44f3 100644
--- a/gnu/usr.bin/binutils/objcopy/Makefile
+++ b/gnu/usr.bin/binutils/objcopy/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.2 1998/03/12 02:55:36 jdp Exp $
+# $FreeBSD$
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/objdump/Makefile b/gnu/usr.bin/binutils/objdump/Makefile
index f712f121b094..9635b35bb146 100644
--- a/gnu/usr.bin/binutils/objdump/Makefile
+++ b/gnu/usr.bin/binutils/objdump/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.2 1998/03/12 02:55:38 jdp Exp $
+# $FreeBSD$
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/ranlib/Makefile b/gnu/usr.bin/binutils/ranlib/Makefile
index 3b7d4e13777a..f3f085092550 100644
--- a/gnu/usr.bin/binutils/ranlib/Makefile
+++ b/gnu/usr.bin/binutils/ranlib/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.2 1998/03/12 02:55:39 jdp Exp $
+# $FreeBSD$
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/size/Makefile b/gnu/usr.bin/binutils/size/Makefile
index e69ac268a62b..9109a766836b 100644
--- a/gnu/usr.bin/binutils/size/Makefile
+++ b/gnu/usr.bin/binutils/size/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.2 1998/03/12 02:55:40 jdp Exp $
+# $FreeBSD$
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/strings/Makefile b/gnu/usr.bin/binutils/strings/Makefile
index 08d4cbe7fdcd..e163cdb900af 100644
--- a/gnu/usr.bin/binutils/strings/Makefile
+++ b/gnu/usr.bin/binutils/strings/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.2 1998/03/12 02:55:42 jdp Exp $
+# $FreeBSD$
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/binutils/strip/Makefile b/gnu/usr.bin/binutils/strip/Makefile
index 13cc895720fd..421a3d446cb6 100644
--- a/gnu/usr.bin/binutils/strip/Makefile
+++ b/gnu/usr.bin/binutils/strip/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.4 1998/06/03 18:01:04 peter Exp $
+# $FreeBSD$
 #
 
 .include "../Makefile.inc0"
diff --git a/gnu/usr.bin/bison/Makefile b/gnu/usr.bin/bison/Makefile
index 5e1b3c0ece27..4fa25c767c60 100644
--- a/gnu/usr.bin/bison/Makefile
+++ b/gnu/usr.bin/bison/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 1999/08/15 22:36:41 obrien Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../../contrib/bison
 
diff --git a/gnu/usr.bin/bison/data/Makefile b/gnu/usr.bin/bison/data/Makefile
index 52e10db703b2..843aebf78a88 100644
--- a/gnu/usr.bin/bison/data/Makefile
+++ b/gnu/usr.bin/bison/data/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.6 1997/08/21 03:28:07 jmg Exp $
+# $FreeBSD$
 
 BISONDIR=${.CURDIR}/../../../../contrib/bison
 
diff --git a/gnu/usr.bin/bison/doc/Makefile b/gnu/usr.bin/bison/doc/Makefile
index 8e294946993d..97bbb93c9e26 100644
--- a/gnu/usr.bin/bison/doc/Makefile
+++ b/gnu/usr.bin/bison/doc/Makefile
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 
 INFO = bison
 INFOSECTION= "Programming & development tools."
diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile
index e88fd232d8c1..4157c8bad0d4 100644
--- a/gnu/usr.bin/cc/Makefile
+++ b/gnu/usr.bin/cc/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.14 1999/04/25 17:09:48 obrien Exp $
+# $FreeBSD$
 
 # The order of some of these are rather important.  Some depend on previous
 # subdirs.
diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc
index 88ef21961fb2..858e46b5bc5b 100644
--- a/gnu/usr.bin/cc/Makefile.inc
+++ b/gnu/usr.bin/cc/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.36 1999/08/01 15:44:50 obrien Exp $
+# $FreeBSD$
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/c++/Makefile b/gnu/usr.bin/cc/c++/Makefile
index ac0d082353ed..1bdbcc303915 100644
--- a/gnu/usr.bin/cc/c++/Makefile
+++ b/gnu/usr.bin/cc/c++/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.11 1999/04/18 09:39:38 obrien Exp $
+# $FreeBSD$
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/c++filt/Makefile b/gnu/usr.bin/cc/c++filt/Makefile
index ef84835cb446..ce2f8980dc3a 100644
--- a/gnu/usr.bin/cc/c++filt/Makefile
+++ b/gnu/usr.bin/cc/c++filt/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.8 1999/08/08 07:31:47 bde Exp $
+# $FreeBSD$
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile
index 384eca665066..1e05747f7196 100644
--- a/gnu/usr.bin/cc/cc/Makefile
+++ b/gnu/usr.bin/cc/cc/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.15 1999/04/18 09:39:37 obrien Exp $
+# $FreeBSD$
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile
index 93f7ed687a1c..aacd46ceaa4e 100644
--- a/gnu/usr.bin/cc/cc1/Makefile
+++ b/gnu/usr.bin/cc/cc1/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.13 1999/04/04 16:36:32 obrien Exp $
+# $FreeBSD$
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/cc1obj/Makefile b/gnu/usr.bin/cc/cc1obj/Makefile
index a9c5e1ba8d35..ac4c5732699f 100644
--- a/gnu/usr.bin/cc/cc1obj/Makefile
+++ b/gnu/usr.bin/cc/cc1obj/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.6 1999/04/04 16:36:33 obrien Exp $
+# $FreeBSD$
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index 17c4d636711b..e68fd305f8af 100644
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.18 1999/08/14 22:44:36 obrien Exp $
+# $FreeBSD$
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/cc_drv/Makefile b/gnu/usr.bin/cc/cc_drv/Makefile
index 8dddbba095c6..034bea38997a 100644
--- a/gnu/usr.bin/cc/cc_drv/Makefile
+++ b/gnu/usr.bin/cc/cc_drv/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1999/04/04 20:29:43 imp Exp $
+# $FreeBSD$
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/cc_int/Makefile b/gnu/usr.bin/cc/cc_int/Makefile
index 938a04d5b901..4b0b62b5f177 100644
--- a/gnu/usr.bin/cc/cc_int/Makefile
+++ b/gnu/usr.bin/cc/cc_int/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.20 1999/04/25 17:23:28 obrien Exp $
+# $FreeBSD$
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index b353fda622e0..ef80109a4490 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.37 1999/08/16 09:55:16 obrien Exp $
+# $FreeBSD$
 
 #
 # This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk
diff --git a/gnu/usr.bin/cc/cc_tools/freebsd-native.h b/gnu/usr.bin/cc/cc_tools/freebsd-native.h
index 99bb829187fd..42bdb20a8213 100644
--- a/gnu/usr.bin/cc/cc_tools/freebsd-native.h
+++ b/gnu/usr.bin/cc/cc_tools/freebsd-native.h
@@ -1,4 +1,4 @@
-/* $Id: freebsd-native.h,v 1.1 1999/04/28 18:48:05 obrien Exp $ */
+/* $FreeBSD$ */
 
 /* FREEBSD_NATIVE is defined when gcc is integrated into the FreeBSD
    source tree so it can be configured appropriately without using
diff --git a/gnu/usr.bin/cc/cccp/Makefile b/gnu/usr.bin/cc/cccp/Makefile
index eec6ef39328b..d8ff4ae2fe04 100644
--- a/gnu/usr.bin/cc/cccp/Makefile
+++ b/gnu/usr.bin/cc/cccp/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.12 1999/04/04 16:36:35 obrien Exp $
+# $FreeBSD$
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/cpp/Makefile b/gnu/usr.bin/cc/cpp/Makefile
index eec6ef39328b..d8ff4ae2fe04 100644
--- a/gnu/usr.bin/cc/cpp/Makefile
+++ b/gnu/usr.bin/cc/cpp/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.12 1999/04/04 16:36:35 obrien Exp $
+# $FreeBSD$
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/doc/Makefile b/gnu/usr.bin/cc/doc/Makefile
index b3b88b69c891..5e44319015bb 100644
--- a/gnu/usr.bin/cc/doc/Makefile
+++ b/gnu/usr.bin/cc/doc/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.8 1999/04/05 07:10:13 obrien Exp $
+# $FreeBSD$
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/f77/Makefile b/gnu/usr.bin/cc/f77/Makefile
index 2e5342c20dbd..d1d572e52d39 100644
--- a/gnu/usr.bin/cc/f77/Makefile
+++ b/gnu/usr.bin/cc/f77/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 1999/04/18 09:42:56 obrien Exp $
+# $FreeBSD$
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/f771/Makefile b/gnu/usr.bin/cc/f771/Makefile
index 62184392577f..4a2ba4066364 100644
--- a/gnu/usr.bin/cc/f771/Makefile
+++ b/gnu/usr.bin/cc/f771/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/04/18 09:33:25 obrien Exp $
+# $FreeBSD$
 
 .include "${.CURDIR}/../Makefile.inc"
 
diff --git a/gnu/usr.bin/cc/f77doc/Makefile b/gnu/usr.bin/cc/f77doc/Makefile
index 30a4a1e94dd7..d6e6384dbb4b 100644
--- a/gnu/usr.bin/cc/f77doc/Makefile
+++ b/gnu/usr.bin/cc/f77doc/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/04/25 17:09:48 obrien Exp $
+# $FreeBSD$
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/cpio/Makefile b/gnu/usr.bin/cpio/Makefile
index 3030eee06323..64d5c5e30f5c 100644
--- a/gnu/usr.bin/cpio/Makefile
+++ b/gnu/usr.bin/cpio/Makefile
@@ -1,7 +1,7 @@
 # Note that this files is under a "BSD" copyright (c) by David O'Brien 1997, 
 # even though it may live in src/gnu/...
 
-# $Id: Makefile,v 1.2 1997/03/30 00:23:37 obrien Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../../contrib/cpio
 
diff --git a/gnu/usr.bin/cpio/doc/Makefile b/gnu/usr.bin/cpio/doc/Makefile
index e18df63aee7f..5ccf5da50a85 100644
--- a/gnu/usr.bin/cpio/doc/Makefile
+++ b/gnu/usr.bin/cpio/doc/Makefile
@@ -1,7 +1,7 @@
 # Note that this files is under a "BSD" copyright (c) by David O'Brien 1997, 
 # even though it may live in src/gnu/...
 
-# $Id: Makefile,v 1.1 1997/04/03 11:20:39 obrien Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../../../contrib/cpio
 
diff --git a/gnu/usr.bin/cvs/Makefile b/gnu/usr.bin/cvs/Makefile
index 46021395df2d..cd7ff2d9754f 100644
--- a/gnu/usr.bin/cvs/Makefile
+++ b/gnu/usr.bin/cvs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.10 1997/02/22 15:45:10 peter Exp $
+# $FreeBSD$
 
 SUBDIR = lib libdiff cvs contrib cvsbug doc tools
 
diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile
index cbb1537f47b7..b8f171bba8c6 100644
--- a/gnu/usr.bin/cvs/cvs/Makefile
+++ b/gnu/usr.bin/cvs/cvs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.24 1998/08/15 17:26:36 markm Exp $
+# $FreeBSD$
 
 .include "${.CURDIR}/../Makefile.inc"
 
diff --git a/gnu/usr.bin/cvs/cvsbug/Makefile b/gnu/usr.bin/cvs/cvsbug/Makefile
index b7714ace3b0f..bb6195b0bf87 100644
--- a/gnu/usr.bin/cvs/cvsbug/Makefile
+++ b/gnu/usr.bin/cvs/cvsbug/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 1997/02/22 15:45:15 peter Exp $
+# $FreeBSD$
 
 .include "${.CURDIR}/../Makefile.inc"
 
diff --git a/gnu/usr.bin/cvs/doc/Makefile b/gnu/usr.bin/cvs/doc/Makefile
index 5c6e3655d970..1954e91fe910 100644
--- a/gnu/usr.bin/cvs/doc/Makefile
+++ b/gnu/usr.bin/cvs/doc/Makefile
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 
 .include "${.CURDIR}/../Makefile.inc"
 
diff --git a/gnu/usr.bin/cvs/lib/Makefile b/gnu/usr.bin/cvs/lib/Makefile
index 0c4905e4359b..ba6db87a4ff7 100644
--- a/gnu/usr.bin/cvs/lib/Makefile
+++ b/gnu/usr.bin/cvs/lib/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.14 1997/05/15 23:00:07 peter Exp $
+# $FreeBSD$
 
 .include "${.CURDIR}/../Makefile.inc"
 
diff --git a/gnu/usr.bin/cvs/libdiff/Makefile b/gnu/usr.bin/cvs/libdiff/Makefile
index 826446f3e30b..aefff8e1db31 100644
--- a/gnu/usr.bin/cvs/libdiff/Makefile
+++ b/gnu/usr.bin/cvs/libdiff/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.14 1997/05/15 23:00:07 peter Exp $
+# $FreeBSD$
 
 .include "${.CURDIR}/../Makefile.inc"
 
diff --git a/gnu/usr.bin/cvs/tools/Makefile b/gnu/usr.bin/cvs/tools/Makefile
index 23e2733020d6..aeb303d64e2c 100644
--- a/gnu/usr.bin/cvs/tools/Makefile
+++ b/gnu/usr.bin/cvs/tools/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1997/02/22 15:45:21 peter Exp $
+# $FreeBSD$
 
 FILES=	INSTALL NEWS README \
 	pcl-cvs-lucid.el pcl-cvs-startup.el \
diff --git a/gnu/usr.bin/dc/Makefile b/gnu/usr.bin/dc/Makefile
index ddc2f01d5715..8ecd2e27d92c 100644
--- a/gnu/usr.bin/dc/Makefile
+++ b/gnu/usr.bin/dc/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.9 1998/05/01 12:01:57 bde Exp $
+# $FreeBSD$
 
 BCDIR=	${.CURDIR}/../../../contrib/bc
 
diff --git a/gnu/usr.bin/dc/doc/Makefile b/gnu/usr.bin/dc/doc/Makefile
index 7dfcd6c1c0a3..2b3d553efb8a 100644
--- a/gnu/usr.bin/dc/doc/Makefile
+++ b/gnu/usr.bin/dc/doc/Makefile
@@ -1,6 +1,6 @@
 # Makefile copyright Andreas Klemm <andreas@FreeBSD.ORG> 1998
 #
-# $Id: Makefile,v 1.4 1997/10/14 18:32:38 jraynard Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../../../contrib/bc/doc
 
diff --git a/gnu/usr.bin/dialog/Makefile b/gnu/usr.bin/dialog/Makefile
index 12591419728d..efbb7931022a 100644
--- a/gnu/usr.bin/dialog/Makefile
+++ b/gnu/usr.bin/dialog/Makefile
@@ -1,5 +1,5 @@
 # Makefile for dialog
-# $Id$
+# $FreeBSD$
 
 PROG=   dialog
 MAN1=   dialog.1
diff --git a/gnu/usr.bin/diff/Makefile b/gnu/usr.bin/diff/Makefile
index 2aeebb0c95b9..75d8c48513a0 100644
--- a/gnu/usr.bin/diff/Makefile
+++ b/gnu/usr.bin/diff/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.7 1997/02/22 15:45:24 peter Exp $
+# $FreeBSD$
 
 .PATH:  ${.CURDIR}/../../../contrib/diff
 
diff --git a/gnu/usr.bin/diff/doc/Makefile b/gnu/usr.bin/diff/doc/Makefile
index 8910545458ed..973dbcc87675 100644
--- a/gnu/usr.bin/diff/doc/Makefile
+++ b/gnu/usr.bin/diff/doc/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 1997/02/22 15:45:26 peter Exp $
+# $FreeBSD$
 
 INFO = diff
 
diff --git a/gnu/usr.bin/diff3/Makefile b/gnu/usr.bin/diff3/Makefile
index b98c2877a5dc..1acd3142c026 100644
--- a/gnu/usr.bin/diff3/Makefile
+++ b/gnu/usr.bin/diff3/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.7 1997/02/22 15:45:24 peter Exp $
+# $FreeBSD$
 
 .PATH:  ${.CURDIR}/../../../contrib/diff
 
diff --git a/gnu/usr.bin/gperf/Makefile b/gnu/usr.bin/gperf/Makefile
index 55c9e84acba0..d0e17301cbb3 100644
--- a/gnu/usr.bin/gperf/Makefile
+++ b/gnu/usr.bin/gperf/Makefile
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../../contrib/gperf
 .PATH:	${.CURDIR}/../../../contrib/gperf/src
diff --git a/gnu/usr.bin/gperf/doc/Makefile b/gnu/usr.bin/gperf/doc/Makefile
index e9ac21d1d5f2..eac57053eb0d 100644
--- a/gnu/usr.bin/gperf/doc/Makefile
+++ b/gnu/usr.bin/gperf/doc/Makefile
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 
 INFO = gperf
 INFOSECTION= "Programming & development tools."
diff --git a/gnu/usr.bin/grep/Makefile b/gnu/usr.bin/grep/Makefile
index 439f494df2d4..0502d670f8c2 100644
--- a/gnu/usr.bin/grep/Makefile
+++ b/gnu/usr.bin/grep/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.14 1998/11/14 23:37:32 wosch Exp $
+# $FreeBSD$
 
 MAINTAINER= wosch
 
diff --git a/gnu/usr.bin/groff/Makefile b/gnu/usr.bin/groff/Makefile
index 8a94ac08963b..f25543ca387a 100644
--- a/gnu/usr.bin/groff/Makefile
+++ b/gnu/usr.bin/groff/Makefile
@@ -1,6 +1,6 @@
 # Makefile for groff
 #
-# $Id$
+# $FreeBSD$
 
 SUBDIR=		libgroff libdriver libbib \
 		addftinfo eqn \
diff --git a/gnu/usr.bin/groff/Makefile.cfg b/gnu/usr.bin/groff/Makefile.cfg
index b3c881f14e99..48d1f42f351f 100644
--- a/gnu/usr.bin/groff/Makefile.cfg
+++ b/gnu/usr.bin/groff/Makefile.cfg
@@ -1,4 +1,4 @@
-#	$Id: Makefile.cfg,v 2.7 1999/04/04 16:44:33 obrien Exp $
+# $FreeBSD$
 
 BINDIR?=	/usr/bin
 SHELL=		/bin/sh
diff --git a/gnu/usr.bin/groff/Makefile.dev b/gnu/usr.bin/groff/Makefile.dev
index 2dcbf5ad8f02..3f9d50617ba1 100644
--- a/gnu/usr.bin/groff/Makefile.dev
+++ b/gnu/usr.bin/groff/Makefile.dev
@@ -2,7 +2,7 @@
 # Client Makefiles define DEV and DEVFILES and provide rules for
 # individual font files
 #
-# $Id: Makefile.dev,v 2.4 1997/02/22 15:45:42 peter Exp $
+# $FreeBSD$
 
 .include "../Makefile.cfg"
 
diff --git a/gnu/usr.bin/groff/devX100-12/Makefile b/gnu/usr.bin/groff/devX100-12/Makefile
index 70b651a979eb..1a50e261d2e5 100644
--- a/gnu/usr.bin/groff/devX100-12/Makefile
+++ b/gnu/usr.bin/groff/devX100-12/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.6 1997/02/22 15:45:45 peter Exp $
+# $FreeBSD$
 #
 # Generic groff font makefile
 
diff --git a/gnu/usr.bin/groff/devX100/Makefile b/gnu/usr.bin/groff/devX100/Makefile
index 4474bafb4dc0..1a50e261d2e5 100644
--- a/gnu/usr.bin/groff/devX100/Makefile
+++ b/gnu/usr.bin/groff/devX100/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.6 1997/02/22 15:45:44 peter Exp $
+# $FreeBSD$
 #
 # Generic groff font makefile
 
diff --git a/gnu/usr.bin/groff/devX75-12/Makefile b/gnu/usr.bin/groff/devX75-12/Makefile
index 34dfe1cbacb1..1a50e261d2e5 100644
--- a/gnu/usr.bin/groff/devX75-12/Makefile
+++ b/gnu/usr.bin/groff/devX75-12/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.6 1997/02/22 15:45:48 peter Exp $
+# $FreeBSD$
 #
 # Generic groff font makefile
 
diff --git a/gnu/usr.bin/groff/devX75/Makefile b/gnu/usr.bin/groff/devX75/Makefile
index ca1e3ce9507e..1a50e261d2e5 100644
--- a/gnu/usr.bin/groff/devX75/Makefile
+++ b/gnu/usr.bin/groff/devX75/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.6 1997/02/22 15:45:46 peter Exp $
+# $FreeBSD$
 #
 # Generic groff font makefile
 
diff --git a/gnu/usr.bin/groff/eqn/Makefile b/gnu/usr.bin/groff/eqn/Makefile
index 5ff6a75850ab..aba129e875a9 100644
--- a/gnu/usr.bin/groff/eqn/Makefile
+++ b/gnu/usr.bin/groff/eqn/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.10 1998/03/20 12:03:53 bde Exp $
+# $FreeBSD$
 
 PROG=		eqn
 SRCS=		eqn.cc eqn.tab.h main.cc lex.cc \
diff --git a/gnu/usr.bin/groff/font/Makefile.dev b/gnu/usr.bin/groff/font/Makefile.dev
index 2dcbf5ad8f02..3f9d50617ba1 100644
--- a/gnu/usr.bin/groff/font/Makefile.dev
+++ b/gnu/usr.bin/groff/font/Makefile.dev
@@ -2,7 +2,7 @@
 # Client Makefiles define DEV and DEVFILES and provide rules for
 # individual font files
 #
-# $Id: Makefile.dev,v 2.4 1997/02/22 15:45:42 peter Exp $
+# $FreeBSD$
 
 .include "../Makefile.cfg"
 
diff --git a/gnu/usr.bin/groff/libgroff/Makefile b/gnu/usr.bin/groff/libgroff/Makefile
index 1061ea68e1e0..8a5dcb47a48c 100644
--- a/gnu/usr.bin/groff/libgroff/Makefile
+++ b/gnu/usr.bin/groff/libgroff/Makefile
@@ -1,6 +1,6 @@
 # Makefile for libgroff
 #
-# $Id$
+# $FreeBSD$
 #
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/groff/pic/Makefile b/gnu/usr.bin/groff/pic/Makefile
index e991184722bf..de800547ed8e 100644
--- a/gnu/usr.bin/groff/pic/Makefile
+++ b/gnu/usr.bin/groff/pic/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=		pic
 SRCS=		lex.cc main.cc object.cc pic.cc pic.tab.h \
diff --git a/gnu/usr.bin/groff/refer/Makefile b/gnu/usr.bin/groff/refer/Makefile
index 512deb075601..4573443a7adf 100644
--- a/gnu/usr.bin/groff/refer/Makefile
+++ b/gnu/usr.bin/groff/refer/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=		refer
 SRCS=		command.cc label.cc ref.cc refer.cc token.cc
diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile
index 77cdef0ce770..bb500891d21c 100644
--- a/gnu/usr.bin/groff/tmac/Makefile
+++ b/gnu/usr.bin/groff/tmac/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.16 1999/07/30 19:15:16 mpp Exp $
+# $FreeBSD$
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/groff/troff/Makefile b/gnu/usr.bin/groff/troff/Makefile
index 41de42cc5788..17cafa2658fe 100644
--- a/gnu/usr.bin/groff/troff/Makefile
+++ b/gnu/usr.bin/groff/troff/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=		troff
 SRCS=		env.cc node.cc input.cc div.cc symbol.cc dictionary.cc reg.cc \
diff --git a/gnu/usr.bin/gzip/Makefile b/gnu/usr.bin/gzip/Makefile
index b0810774aeb3..4019dabf19ed 100644
--- a/gnu/usr.bin/gzip/Makefile
+++ b/gnu/usr.bin/gzip/Makefile
@@ -1,5 +1,5 @@
 #       @(#)Makefile    5.3 (Berkeley) 5/12/90
-#	$Id: Makefile,v 1.19 1998/01/25 09:52:32 jb Exp $
+# $FreeBSD$
 
 PROG=	gzip
 SRCS=	gzip.c zip.c deflate.c trees.c bits.c unzip.c inflate.c util.c \
diff --git a/gnu/usr.bin/gzip/bits.c b/gnu/usr.bin/gzip/bits.c
index 079434a58dbf..efce3910632e 100644
--- a/gnu/usr.bin/gzip/bits.c
+++ b/gnu/usr.bin/gzip/bits.c
@@ -60,7 +60,7 @@
 #endif
 
 #ifdef RCSID
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* ===========================================================================
diff --git a/gnu/usr.bin/gzip/crypt.c b/gnu/usr.bin/gzip/crypt.c
index 023336812a6c..cdbd812368cc 100644
--- a/gnu/usr.bin/gzip/crypt.c
+++ b/gnu/usr.bin/gzip/crypt.c
@@ -2,5 +2,5 @@
  * Hardly worth copyrighting :-)
  */
 #ifdef RCSID
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
diff --git a/gnu/usr.bin/gzip/deflate.c b/gnu/usr.bin/gzip/deflate.c
index a544c353c668..cbc48843ce1d 100644
--- a/gnu/usr.bin/gzip/deflate.c
+++ b/gnu/usr.bin/gzip/deflate.c
@@ -68,7 +68,7 @@
 #include "lzw.h" /* just for consistency checking */
 
 #ifdef RCSID
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* ===========================================================================
diff --git a/gnu/usr.bin/gzip/gzexe b/gnu/usr.bin/gzip/gzexe
index b6107261fe35..19a1d7ee31bd 100644
--- a/gnu/usr.bin/gzip/gzexe
+++ b/gnu/usr.bin/gzip/gzexe
@@ -12,7 +12,7 @@
 # The : is required for some old versions of csh.
 # On Ultrix, /bin/sh is too buggy, change the first line to: #!/bin/sh5
 #
-# $Id$
+# $FreeBSD$
 
 x=`basename $0`
 if test $# = 0; then
diff --git a/gnu/usr.bin/gzip/gzip.c b/gnu/usr.bin/gzip/gzip.c
index 08803e3c1395..b59b4d1a7a4c 100644
--- a/gnu/usr.bin/gzip/gzip.c
+++ b/gnu/usr.bin/gzip/gzip.c
@@ -45,7 +45,7 @@ static char  *license_msg[] = {
  */
 
 #ifdef RCSID
-static char rcsid[] = "$Id: gzip.c,v 1.4 1998/11/22 20:03:21 deraadt Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/usr.bin/gzip/inflate.c b/gnu/usr.bin/gzip/inflate.c
index e7416626b91c..c9b250b3bd61 100644
--- a/gnu/usr.bin/gzip/inflate.c
+++ b/gnu/usr.bin/gzip/inflate.c
@@ -97,7 +97,7 @@
  */
 
 #ifdef RCSID
-static char rcsid[] = "$Id: inflate.c,v 1.6 1997/02/22 15:45:58 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include <sys/types.h>
diff --git a/gnu/usr.bin/gzip/lzw.c b/gnu/usr.bin/gzip/lzw.c
index eb67d46e8b7f..934a8d994d41 100644
--- a/gnu/usr.bin/gzip/lzw.c
+++ b/gnu/usr.bin/gzip/lzw.c
@@ -3,7 +3,7 @@
  */
 
 #ifdef RCSID
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "tailor.h"
diff --git a/gnu/usr.bin/gzip/match.S b/gnu/usr.bin/gzip/match.S
index c0f933cca09c..6ae803493c64 100644
--- a/gnu/usr.bin/gzip/match.S
+++ b/gnu/usr.bin/gzip/match.S
@@ -9,7 +9,7 @@
  * Kristoffer Eriksson <ske@pkmab.se>
  */
  
-/* $Id: match.S,v 1.5 1997/02/22 15:45:59 peter Exp $ */
+/* $FreeBSD$ */
 
 /* Preprocess with -DNO_UNDERLINE if your C compiler does not prefix
  * external symbols with an underline character '_'.
diff --git a/gnu/usr.bin/gzip/revision.h b/gnu/usr.bin/gzip/revision.h
index 9bbb5a9ce3ec..43b0885e4154 100644
--- a/gnu/usr.bin/gzip/revision.h
+++ b/gnu/usr.bin/gzip/revision.h
@@ -13,4 +13,4 @@
 #  undef LZW
 #endif
 
-/* $Id$ */
+/* $FreeBSD$ */
diff --git a/gnu/usr.bin/gzip/tailor.h b/gnu/usr.bin/gzip/tailor.h
index 75e4a19bced8..abdde17d18fd 100644
--- a/gnu/usr.bin/gzip/tailor.h
+++ b/gnu/usr.bin/gzip/tailor.h
@@ -8,7 +8,7 @@
  * The target dependent functions should be defined in tailor.c.
  */
 
-/* $Id$ */
+/* $FreeBSD$ */
 
 #if defined(__MSDOS__) && !defined(MSDOS)
 #  define MSDOS
diff --git a/gnu/usr.bin/gzip/trees.c b/gnu/usr.bin/gzip/trees.c
index 1bad5899302c..fe2405e47f52 100644
--- a/gnu/usr.bin/gzip/trees.c
+++ b/gnu/usr.bin/gzip/trees.c
@@ -59,7 +59,7 @@
 #include "gzip.h"
 
 #ifdef RCSID
-static char rcsid[] = "$Id: trees.c,v 1.7 1997/08/29 16:14:19 sos Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 /* ===========================================================================
diff --git a/gnu/usr.bin/gzip/unlzh.c b/gnu/usr.bin/gzip/unlzh.c
index f6399115255d..971ecc0389a4 100644
--- a/gnu/usr.bin/gzip/unlzh.c
+++ b/gnu/usr.bin/gzip/unlzh.c
@@ -4,7 +4,7 @@
  */
 
 #ifdef RCSID
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include <stdio.h>
diff --git a/gnu/usr.bin/gzip/unlzw.c b/gnu/usr.bin/gzip/unlzw.c
index 470d0edb6a41..7e89ca487822 100644
--- a/gnu/usr.bin/gzip/unlzw.c
+++ b/gnu/usr.bin/gzip/unlzw.c
@@ -8,7 +8,7 @@
  */
 
 #ifdef RCSID
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include <sys/types.h>
diff --git a/gnu/usr.bin/gzip/unpack.c b/gnu/usr.bin/gzip/unpack.c
index a9bc18e7e177..a0ef28699e4c 100644
--- a/gnu/usr.bin/gzip/unpack.c
+++ b/gnu/usr.bin/gzip/unpack.c
@@ -5,7 +5,7 @@
  */
 
 #ifdef RCSID
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "tailor.h"
diff --git a/gnu/usr.bin/gzip/unzip.c b/gnu/usr.bin/gzip/unzip.c
index cd3d50e5a05a..e36555a97536 100644
--- a/gnu/usr.bin/gzip/unzip.c
+++ b/gnu/usr.bin/gzip/unzip.c
@@ -14,7 +14,7 @@
  */
 
 #ifdef RCSID
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include "tailor.h"
diff --git a/gnu/usr.bin/gzip/util.c b/gnu/usr.bin/gzip/util.c
index 58fef0819aab..684cc5dd4a54 100644
--- a/gnu/usr.bin/gzip/util.c
+++ b/gnu/usr.bin/gzip/util.c
@@ -5,7 +5,7 @@
  */
 
 #ifdef RCSID
-static char rcsid[] = "$Id: util.c,v 1.6 1997/02/22 15:46:10 peter Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/usr.bin/gzip/zdiff b/gnu/usr.bin/gzip/zdiff
index a8ba5fe6324c..ebc9eca485a3 100644
--- a/gnu/usr.bin/gzip/zdiff
+++ b/gnu/usr.bin/gzip/zdiff
@@ -9,7 +9,7 @@
 # necessary) and fed to cmp or diff.  The exit status from cmp
 # or diff is preserved.
 #
-# $Id$
+# $FreeBSD$
 
 prog=`echo $0 | sed 's|.*/||'`
 case "$prog" in
diff --git a/gnu/usr.bin/gzip/zforce b/gnu/usr.bin/gzip/zforce
index 02d07e73fe66..146db92c86d1 100644
--- a/gnu/usr.bin/gzip/zforce
+++ b/gnu/usr.bin/gzip/zforce
@@ -5,7 +5,7 @@
 # This can be useful for files with names truncated after a file transfer.
 # foo is renamed to foo.gz
 #
-# $Id: zforce,v 1.3 1999/05/28 13:23:20 kris Exp $
+# $FreeBSD$
 
 x=`basename $0`
 if test $# = 0; then
diff --git a/gnu/usr.bin/gzip/zgrep b/gnu/usr.bin/gzip/zgrep
index 32a27457de0c..fe5efb9917fd 100644
--- a/gnu/usr.bin/gzip/zgrep
+++ b/gnu/usr.bin/gzip/zgrep
@@ -3,7 +3,7 @@
 # zgrep -- a wrapper around a grep program that decompresses files as needed
 # Adapted from a version sent by Charles Levert <charles@comm.polymtl.ca>
 #
-# $Id$
+# $FreeBSD$
 
 prog=`echo $0 | sed 's|.*/||'`
 case "$prog" in
diff --git a/gnu/usr.bin/gzip/zgrep.getopt b/gnu/usr.bin/gzip/zgrep.getopt
index 58564b3a5040..e6811b7e969e 100644
--- a/gnu/usr.bin/gzip/zgrep.getopt
+++ b/gnu/usr.bin/gzip/zgrep.getopt
@@ -26,7 +26,7 @@
 #
 # zgrep - search possibly compressed files for a regular expression
 #
-# $Id: zgrep.getopt,v 1.5 1997/04/19 20:06:57 wosch Exp $
+# $FreeBSD$
 
 
 PATH=/bin:/usr/bin:$PATH; export PATH
diff --git a/gnu/usr.bin/gzip/zgrep.libz b/gnu/usr.bin/gzip/zgrep.libz
index 07d5267fa4a9..3001efae61e0 100644
--- a/gnu/usr.bin/gzip/zgrep.libz
+++ b/gnu/usr.bin/gzip/zgrep.libz
@@ -5,7 +5,7 @@
 # zgrep - Search possibly compressed files for a regular expression. This
 #         version of zgrep(1) depend on a grep(1) linked with libz.
 #
-# $Id$
+# $FreeBSD$
 
 PATH=/bin:/usr/bin; export PATH
 
diff --git a/gnu/usr.bin/gzip/zip.c b/gnu/usr.bin/gzip/zip.c
index 145116de1ea6..c5b985e71dc0 100644
--- a/gnu/usr.bin/gzip/zip.c
+++ b/gnu/usr.bin/gzip/zip.c
@@ -5,7 +5,7 @@
  */
 
 #ifdef RCSID
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include <ctype.h>
diff --git a/gnu/usr.bin/gzip/zmore b/gnu/usr.bin/gzip/zmore
index 2590423333c2..f5c2d5fe6014 100644
--- a/gnu/usr.bin/gzip/zmore
+++ b/gnu/usr.bin/gzip/zmore
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id$
+# $FreeBSD$
 
 if test "`echo -n a`" = "-n a"; then
   # looks like a SysV system:
diff --git a/gnu/usr.bin/gzip/zmore.1 b/gnu/usr.bin/gzip/zmore.1
index 3c9d928cfd99..b8157e519f5e 100644
--- a/gnu/usr.bin/gzip/zmore.1
+++ b/gnu/usr.bin/gzip/zmore.1
@@ -1,4 +1,4 @@
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH ZMORE 1
 .SH NAME
diff --git a/gnu/usr.bin/gzip/znew b/gnu/usr.bin/gzip/znew
index 53226c31ca87..8e0e26bc76bd 100644
--- a/gnu/usr.bin/gzip/znew
+++ b/gnu/usr.bin/gzip/znew
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id$
+# $FreeBSD$
 
 check=0
 pipe=0
diff --git a/gnu/usr.bin/ld/Makefile b/gnu/usr.bin/ld/Makefile
index 37305d1bfdae..f7182ab27a13 100644
--- a/gnu/usr.bin/ld/Makefile
+++ b/gnu/usr.bin/ld/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.27 1998/09/09 11:22:28 kato Exp $
+# $FreeBSD$
 #
 
 RTLD=	${.CURDIR}/../../../libexec/rtld-aout
diff --git a/gnu/usr.bin/ld/PORTING b/gnu/usr.bin/ld/PORTING
index e9f76145e746..4a91ff81ce03 100644
--- a/gnu/usr.bin/ld/PORTING
+++ b/gnu/usr.bin/ld/PORTING
@@ -1,4 +1,4 @@
-$Id$
+$FreeBSD$
 
 This document describes some of the machine dependent parts in ld(1) and rtld(?)
 Most of the machine dependencies are a result of different ways in which
diff --git a/gnu/usr.bin/ld/ld.1 b/gnu/usr.bin/ld/ld.1
index 7aee4d7f6c98..74d4b2cc3e62 100644
--- a/gnu/usr.bin/ld/ld.1
+++ b/gnu/usr.bin/ld/ld.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: ld.1,v 1.19 1997/08/23 21:59:41 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 14, 1993
 .Dt LD 1
diff --git a/gnu/usr.bin/ld/ld.1aout b/gnu/usr.bin/ld/ld.1aout
index 7aee4d7f6c98..74d4b2cc3e62 100644
--- a/gnu/usr.bin/ld/ld.1aout
+++ b/gnu/usr.bin/ld/ld.1aout
@@ -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: ld.1,v 1.19 1997/08/23 21:59:41 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 14, 1993
 .Dt LD 1
diff --git a/gnu/usr.bin/ld/ld.c b/gnu/usr.bin/ld/ld.c
index eafe5e2a7af0..316df2835f36 100644
--- a/gnu/usr.bin/ld/ld.c
+++ b/gnu/usr.bin/ld/ld.c
@@ -32,7 +32,7 @@ static char sccsid[] = "@(#)ld.c	6.10 (Berkeley) 5/22/91";
    Set, indirect, and warning symbol features added by Randy Smith. */
 
 /*
- *	$Id: ld.c,v 1.45 1997/05/13 10:23:46 dfr Exp $
+ * $FreeBSD$
  */
 
 /* Define how to initialize system-dependent header fields.  */
diff --git a/gnu/usr.bin/ld/ld.h b/gnu/usr.bin/ld/ld.h
index 6bd409801c17..4aaa775ec713 100644
--- a/gnu/usr.bin/ld/ld.h
+++ b/gnu/usr.bin/ld/ld.h
@@ -1,5 +1,5 @@
 /*
- *	$Id$
+ * $FreeBSD$
  */
 /*-
  * This code is derived from software copyrighted by the Free Software
diff --git a/gnu/usr.bin/ld/lib.c b/gnu/usr.bin/ld/lib.c
index 1abd974164b9..7881584cc077 100644
--- a/gnu/usr.bin/ld/lib.c
+++ b/gnu/usr.bin/ld/lib.c
@@ -30,7 +30,7 @@
    Set, indirect, and warning symbol features added by Randy Smith. */
 
 /*
- * $Id: lib.c,v 1.21 1997/02/22 15:46:22 peter Exp $	- library routines
+ * $FreeBSD$	- library routines
  */
 
 #include <sys/param.h>
diff --git a/gnu/usr.bin/ld/rrs.c b/gnu/usr.bin/ld/rrs.c
index 85688048df47..fbd356c3a325 100644
--- a/gnu/usr.bin/ld/rrs.c
+++ b/gnu/usr.bin/ld/rrs.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: rrs.c,v 1.22 1997/05/13 10:23:47 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/gnu/usr.bin/ld/sparc/md-static-funcs.c b/gnu/usr.bin/ld/sparc/md-static-funcs.c
index 346bd8fcb761..04558ee569d0 100644
--- a/gnu/usr.bin/ld/sparc/md-static-funcs.c
+++ b/gnu/usr.bin/ld/sparc/md-static-funcs.c
@@ -1,6 +1,6 @@
 
 /*
- *	$Id$
+ * $FreeBSD$
  *
  * Simple SPARC relocations for the benefit of self-relocation of ld.so
  * avoiding the use of global variables (ie. reloc_bitshift[] et. al.).
diff --git a/gnu/usr.bin/ld/sparc/md.c b/gnu/usr.bin/ld/sparc/md.c
index b1af3dd87dc5..20d241036f6b 100644
--- a/gnu/usr.bin/ld/sparc/md.c
+++ b/gnu/usr.bin/ld/sparc/md.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$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/gnu/usr.bin/ld/sparc/md.h b/gnu/usr.bin/ld/sparc/md.h
index ffa5853af41a..7c8a5683b3bb 100644
--- a/gnu/usr.bin/ld/sparc/md.h
+++ b/gnu/usr.bin/ld/sparc/md.h
@@ -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$
+ * $FreeBSD$
  */
 
 /*
diff --git a/gnu/usr.bin/ld/sparc/mdprologue.S b/gnu/usr.bin/ld/sparc/mdprologue.S
index df146eeb2011..68140ae4a725 100644
--- a/gnu/usr.bin/ld/sparc/mdprologue.S
+++ b/gnu/usr.bin/ld/sparc/mdprologue.S
@@ -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$
+ * $FreeBSD$
  */
 
 /*
diff --git a/gnu/usr.bin/ld/symbol.c b/gnu/usr.bin/ld/symbol.c
index d37a1a34bac0..350b23bd0620 100644
--- a/gnu/usr.bin/ld/symbol.c
+++ b/gnu/usr.bin/ld/symbol.c
@@ -31,7 +31,7 @@
 
 /*
  * symbol table routines
- * $Id$
+ * $FreeBSD$
  */
 
 /* Create the symbol table entries for `etext', `edata' and `end'.  */
diff --git a/gnu/usr.bin/ld/symseg.h b/gnu/usr.bin/ld/symseg.h
index 116a8b2f87ec..fbe530f6f07f 100644
--- a/gnu/usr.bin/ld/symseg.h
+++ b/gnu/usr.bin/ld/symseg.h
@@ -4,7 +4,7 @@
  * Foundation.
  *
  *	from: @(#)symseg.h	5.4 (Berkeley) 4/30/91
- *	$Id$
+ * $FreeBSD$
  */
 
 /* GDB symbol table format definitions.
diff --git a/gnu/usr.bin/ld/warnings.c b/gnu/usr.bin/ld/warnings.c
index 4dfd1a25808a..2c988d554fe4 100644
--- a/gnu/usr.bin/ld/warnings.c
+++ b/gnu/usr.bin/ld/warnings.c
@@ -30,7 +30,7 @@
    Set, indirect, and warning symbol features added by Randy Smith. */
 
 /*
- * $Id: warnings.c,v 1.16 1998/06/30 20:48:39 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/gnu/usr.bin/ld/xbits.c b/gnu/usr.bin/ld/xbits.c
index 850c646fa5f0..f5a2740c8c5f 100644
--- a/gnu/usr.bin/ld/xbits.c
+++ b/gnu/usr.bin/ld/xbits.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$
+ * $FreeBSD$
  */
 
 /*
diff --git a/gnu/usr.bin/man/Makefile.shprog b/gnu/usr.bin/man/Makefile.shprog
index 665a194917ff..819ed33ebb8e 100644
--- a/gnu/usr.bin/man/Makefile.shprog
+++ b/gnu/usr.bin/man/Makefile.shprog
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 
 # This may become bsd.shprog.mk.  The general version would have to handle:
 # - arbitrary sed substitutions.
diff --git a/gnu/usr.bin/man/apropos/Makefile b/gnu/usr.bin/man/apropos/Makefile
index 9492c9bc2f7e..de23d925f7e6 100644
--- a/gnu/usr.bin/man/apropos/Makefile
+++ b/gnu/usr.bin/man/apropos/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.13 1997/02/22 15:46:57 peter Exp $
+# $FreeBSD$
 MAINTAINER= wosch
 
 SHPROG=	apropos
diff --git a/gnu/usr.bin/man/apropos/apropos.sh b/gnu/usr.bin/man/apropos/apropos.sh
index 1b548a6d4caf..4f68263ce4ec 100644
--- a/gnu/usr.bin/man/apropos/apropos.sh
+++ b/gnu/usr.bin/man/apropos/apropos.sh
@@ -15,7 +15,7 @@
 # The University of Texas at Austin
 # Austin, Texas  78712
 #
-# $Id$
+# $FreeBSD$
 
 
 PATH=/bin:/usr/bin:$PATH
diff --git a/gnu/usr.bin/man/catman/Makefile b/gnu/usr.bin/man/catman/Makefile
index f18d19febb27..075bfdf7d866 100644
--- a/gnu/usr.bin/man/catman/Makefile
+++ b/gnu/usr.bin/man/catman/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 MAINTAINER= wosch
 
diff --git a/gnu/usr.bin/man/catman/catman.1 b/gnu/usr.bin/man/catman/catman.1
index aaa0c443d97c..13fefaf59868 100644
--- a/gnu/usr.bin/man/catman/catman.1
+++ b/gnu/usr.bin/man/catman/catman.1
@@ -24,7 +24,7 @@
 .\"
 .\" /usr/bin/catman - preformat man pages
 .\"
-.\" $Id: catman.1,v 1.14 1998/02/07 05:17:47 alex Exp $
+.\" $FreeBSD$
 .Dd Mar 12, 1995
 .Dt CATMAN 1
 .Os
diff --git a/gnu/usr.bin/man/catman/catman.perl b/gnu/usr.bin/man/catman/catman.perl
index d94f94927cb5..5add5d44b985 100644
--- a/gnu/usr.bin/man/catman/catman.perl
+++ b/gnu/usr.bin/man/catman/catman.perl
@@ -26,7 +26,7 @@
 #
 # /usr/bin/catman - preformat man pages
 #
-# $Id: catman.perl,v 1.11 1998/05/01 13:27:27 des Exp $
+# $FreeBSD$
 
 
 sub usage {
diff --git a/gnu/usr.bin/man/makewhatis/Makefile b/gnu/usr.bin/man/makewhatis/Makefile
index 4312ae5247bb..1de2f08a0759 100644
--- a/gnu/usr.bin/man/makewhatis/Makefile
+++ b/gnu/usr.bin/man/makewhatis/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 MAINTAINER= wosch
 
 MAN1=	makewhatis.1
diff --git a/gnu/usr.bin/man/makewhatis/makewhatis.1 b/gnu/usr.bin/man/makewhatis/makewhatis.1
index 1c238b7a9f60..ec9ae5788b60 100644
--- a/gnu/usr.bin/man/makewhatis/makewhatis.1
+++ b/gnu/usr.bin/man/makewhatis/makewhatis.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: makewhatis.1,v 1.11 1997/06/23 04:51:30 steve Exp $
+.\" $FreeBSD$
 .Dd January 12, 1995
 .Dt MAKEWHATIS 1
 .Os FreeBSD 2.1
diff --git a/gnu/usr.bin/man/makewhatis/makewhatis.local.8 b/gnu/usr.bin/man/makewhatis/makewhatis.local.8
index 8f7bc5b506fe..81a6e1fb66b3 100644
--- a/gnu/usr.bin/man/makewhatis/makewhatis.local.8
+++ b/gnu/usr.bin/man/makewhatis/makewhatis.local.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: makewhatis.local.8,v 1.6 1997/06/23 04:51:30 steve Exp $
+.\" $FreeBSD$
 .Dd April 26, 1996
 .Dt MAKEWHATIS.LOCAL 8
 .Os FreeBSD 2.2
diff --git a/gnu/usr.bin/man/makewhatis/makewhatis.local.sh b/gnu/usr.bin/man/makewhatis/makewhatis.local.sh
index 56ebc7e42d53..8be25300b75d 100644
--- a/gnu/usr.bin/man/makewhatis/makewhatis.local.sh
+++ b/gnu/usr.bin/man/makewhatis/makewhatis.local.sh
@@ -33,7 +33,7 @@
 #
 # PS: this wrapper works also for catman(1)
 #
-# $Id: makewhatis.local.sh,v 1.5 1997/02/22 15:47:03 peter Exp $
+# $FreeBSD$
 
 PATH=/bin:/usr/bin:$PATH; export PATH
 opt= dirs= localdirs=
diff --git a/gnu/usr.bin/man/makewhatis/makewhatis.perl b/gnu/usr.bin/man/makewhatis/makewhatis.perl
index 841c2c0e6e16..baf77d80e089 100644
--- a/gnu/usr.bin/man/makewhatis/makewhatis.perl
+++ b/gnu/usr.bin/man/makewhatis/makewhatis.perl
@@ -26,7 +26,7 @@
 #
 # makewhatis -- update the whatis database in the man directories.
 #
-# $Id: makewhatis.perl,v 1.17 1997/07/04 22:32:59 wosch Exp $
+# $FreeBSD$
 
 
 sub usage {
diff --git a/gnu/usr.bin/man/man/Makefile b/gnu/usr.bin/man/man/Makefile
index 408df912ff83..3fa2cd5d9a82 100644
--- a/gnu/usr.bin/man/man/Makefile
+++ b/gnu/usr.bin/man/man/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.25 1999/07/05 02:46:20 hoek Exp $
+# $FreeBSD$
 #
 
 PROG=	man
diff --git a/gnu/usr.bin/man/manpath/manpath.config b/gnu/usr.bin/man/manpath/manpath.config
index d3597e74dd84..b340fea14187 100644
--- a/gnu/usr.bin/man/manpath/manpath.config
+++ b/gnu/usr.bin/man/manpath/manpath.config
@@ -1,4 +1,4 @@
-#	$Id: manpath.config,v 1.12 1999/08/16 11:34:56 ru Exp $
+# $FreeBSD$
 #
 # This file is read by manpath(1) to configure the mandatory manpath,
 # optional manpath and to map each path element to a manpath element.
diff --git a/gnu/usr.bin/man/manpath/manpath.man b/gnu/usr.bin/man/manpath/manpath.man
index c27c0740b71e..5b54a099e627 100644
--- a/gnu/usr.bin/man/manpath/manpath.man
+++ b/gnu/usr.bin/man/manpath/manpath.man
@@ -12,7 +12,7 @@
 .\" The University of Texas at Austin
 .\" Austin, Texas  78712
 .\"
-.\" $Id$
+.\" $FreeBSD$
 .Dd Aug 16, 1999
 .Dt MANPATH 1
 .Os
diff --git a/gnu/usr.bin/perl/Makefile b/gnu/usr.bin/perl/Makefile
index d53d01faf6a1..967b0ce22e73 100644
--- a/gnu/usr.bin/perl/Makefile
+++ b/gnu/usr.bin/perl/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 1998/09/30 20:24:59 markm Exp $
+# $FreeBSD$
 
 .if !defined(NOSUIDPERL)
 _suidperl=	suidperl
diff --git a/gnu/usr.bin/perl/Makefile.inc b/gnu/usr.bin/perl/Makefile.inc
index fd417c7c714c..7c36011eb838 100644
--- a/gnu/usr.bin/perl/Makefile.inc
+++ b/gnu/usr.bin/perl/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.6 1998/10/11 18:13:41 markm Exp $
+# $FreeBSD$
 
 PERL5SRC?= ${.CURDIR}/../../../../contrib/perl5
 
diff --git a/gnu/usr.bin/perl/libperl/Makefile b/gnu/usr.bin/perl/libperl/Makefile
index 2d92a903186c..7f264b89ea2a 100644
--- a/gnu/usr.bin/perl/libperl/Makefile
+++ b/gnu/usr.bin/perl/libperl/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.4 1998/09/16 17:25:51 markm Exp $
+# $FreeBSD$
 #
 
 LIB=	perl
diff --git a/gnu/usr.bin/perl/libperl/config.SH-aout.i386 b/gnu/usr.bin/perl/libperl/config.SH-aout.i386
index 1cf99916fb7a..1f80af154209 100644
--- a/gnu/usr.bin/perl/libperl/config.SH-aout.i386
+++ b/gnu/usr.bin/perl/libperl/config.SH-aout.i386
@@ -1,22 +1,22 @@
 #!/bin/sh
 #
-# $Id: config.SH-aout.i386,v 1.11 1999/05/02 15:29:39 markm Exp $
+# $FreeBSD$
 #
 
 # Package name      : perl5
 # Source directory  : .
-# Configuration time: $Date: 1999/05/02 15:29:39 $
+# Configuration time: $Date: 1999/05/05 19:09:48 $
 # Configured by     : markm
 # Target system     : freebsd 3.0-current #0:
 
 Author=''
-Date='$Date: 1999/05/02 15:29:39 $'
+Date='$Date: 1999/05/05 19:09:48 $'
 Header=''
-Id='$Id: config.SH-aout.i386,v 1.11 1999/05/02 15:29:39 markm Exp $'
+Id='$FreeBSD$'
 Locker=''
 Mcc='Mcc'
 RCSfile='$RCSfile: config.SH-aout.i386,v $'
-Revision='$Revision: 1.11 $'
+Revision='$Revision: 1.12 $'
 Source=''
 State=''
 _a='.a'
@@ -51,7 +51,7 @@ ccsymbols='__ELF__=0 __FreeBSD__=4 __FreeBSD_cc_version=400002 __GNUC_MINOR__=9
 1 __GNUC__=2 cpu=i386 machine=i386 system=FreeBSD system=unix'
 cf_by='markm'
 cf_email='markm@freebsd.org'
-cf_time='$Date: 1999/05/02 15:29:39 $'
+cf_time='$Date: 1999/05/05 19:09:48 $'
 chgrp=''
 chmod=''
 chown=''
@@ -458,7 +458,7 @@ mv=''
 myarchname='i386-freebsd'
 mydomain='.freebsd.org'
 myhostname='freefall'
-myuname='freebsd freefall.freebsd.org 4.0-current freebsd 4.0-current #0: $Date: 1999/05/02 15:29:39 $'
+myuname='freebsd freefall.freebsd.org 4.0-current freebsd 4.0-current #0: $Date: 1999/05/05 19:09:48 $'
 n='-n'
 netdb_hlen_type='int'
 netdb_host_type='const char *'
diff --git a/gnu/usr.bin/perl/libperl/config.SH-elf.alpha b/gnu/usr.bin/perl/libperl/config.SH-elf.alpha
index 818c9d03041f..8983906e8565 100644
--- a/gnu/usr.bin/perl/libperl/config.SH-elf.alpha
+++ b/gnu/usr.bin/perl/libperl/config.SH-elf.alpha
@@ -1,22 +1,22 @@
 #!/bin/sh
 #
-# $Id: config.SH-elf.alpha,v 1.12 1999/05/02 15:29:40 markm Exp $
+# $FreeBSD$
 #
 
 # Package name      : perl5
 # Source directory  : .
-# Configuration time: $Date: 1999/05/02 15:29:40 $
+# Configuration time: $Date: 1999/05/05 19:09:48 $
 # Configured by     : markm
 # Target system     : freebsd 3.0-current #0:
 
 Author=''
-Date='$Date: 1999/05/02 15:29:40 $'
+Date='$Date: 1999/05/05 19:09:48 $'
 Header=''
-Id='$Id: config.SH-elf.alpha,v 1.12 1999/05/02 15:29:40 markm Exp $'
+Id='$FreeBSD$'
 Locker=''
 Mcc='Mcc'
 RCSfile='$RCSfile: config.SH-elf.alpha,v $'
-Revision='$Revision: 1.12 $'
+Revision='$Revision: 1.13 $'
 Source=''
 State=''
 _a='.a'
@@ -50,7 +50,7 @@ ccflags=''
 ccsymbols='__ELF__=1 __FreeBSD__=4 __FreeBSD_cc_version=400002 __GNUC_MINOR__=91 __GNUC__=2 cpu=alpha machine=alpha system=FreeBSD system=unix'
 cf_by='markm'
 cf_email='markm@freebsd.org'
-cf_time='$Date: 1999/05/02 15:29:40 $'
+cf_time='$Date: 1999/05/05 19:09:48 $'
 chgrp=''
 chmod=''
 chown=''
@@ -457,7 +457,7 @@ mv=''
 myarchname='alpha-freebsd'
 mydomain='.freebsd.org'
 myhostname='freefall'
-myuname='freebsd freefall.freebsd.org 4.0-current freebsd 4.0-current #0: $Date: 1999/05/02 15:29:40 $'
+myuname='freebsd freefall.freebsd.org 4.0-current freebsd 4.0-current #0: $Date: 1999/05/05 19:09:48 $'
 n='-n'
 netdb_hlen_type='int'
 netdb_host_type='const char *'
diff --git a/gnu/usr.bin/perl/libperl/config.SH-elf.i386 b/gnu/usr.bin/perl/libperl/config.SH-elf.i386
index f78d89a01ab4..53eb9c7fabb4 100644
--- a/gnu/usr.bin/perl/libperl/config.SH-elf.i386
+++ b/gnu/usr.bin/perl/libperl/config.SH-elf.i386
@@ -1,22 +1,22 @@
 #!/bin/sh
 #
-# $Id: config.SH-elf.i386,v 1.11 1999/05/02 15:29:42 markm Exp $
+# $FreeBSD$
 #
 
 # Package name      : perl5
 # Source directory  : .
-# Configuration time: $Date: 1999/05/02 15:29:42 $
+# Configuration time: $Date: 1999/05/05 19:09:48 $
 # Configured by     : markm
 # Target system     : freebsd 3.0-current #0:
 
 Author=''
-Date='$Date: 1999/05/02 15:29:42 $'
+Date='$Date: 1999/05/05 19:09:48 $'
 Header=''
-Id='$Id: config.SH-elf.i386,v 1.11 1999/05/02 15:29:42 markm Exp $'
+Id='$FreeBSD$'
 Locker=''
 Mcc='Mcc'
 RCSfile='$RCSfile: config.SH-elf.i386,v $'
-Revision='$Revision: 1.11 $'
+Revision='$Revision: 1.12 $'
 Source=''
 State=''
 _a='.a'
@@ -50,7 +50,7 @@ ccflags=''
 ccsymbols='__ELF__=1 __FreeBSD__=4 __FreeBSD_cc_version=400002 __GNUC_MINOR__=91 __GNUC__=2 cpu=i386 machine=i386 system=FreeBSD system=unix'
 cf_by='markm'
 cf_email='markm@freebsd.org'
-cf_time='$Date: 1999/05/02 15:29:42 $'
+cf_time='$Date: 1999/05/05 19:09:48 $'
 chgrp=''
 chmod=''
 chown=''
@@ -457,7 +457,7 @@ mv=''
 myarchname='i386-freebsd'
 mydomain='.freebsd.org'
 myhostname='freefall'
-myuname='freebsd freefall.freebsd.org 4.0-current freebsd 4.0-current #0: $Date: 1999/05/02 15:29:42 $'
+myuname='freebsd freefall.freebsd.org 4.0-current freebsd 4.0-current #0: $Date: 1999/05/05 19:09:48 $'
 n='-n'
 netdb_hlen_type='int'
 netdb_host_type='const char *'
diff --git a/gnu/usr.bin/perl/miniperl/Makefile b/gnu/usr.bin/perl/miniperl/Makefile
index f72e70bc124a..e072d5ee2196 100644
--- a/gnu/usr.bin/perl/miniperl/Makefile
+++ b/gnu/usr.bin/perl/miniperl/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.6 1998/09/26 16:17:05 markm Exp $
+# $FreeBSD$
 #
 
 PROG=	miniperl
diff --git a/gnu/usr.bin/perl/perl/Makefile b/gnu/usr.bin/perl/perl/Makefile
index 9c5d9a225651..7523f0939209 100644
--- a/gnu/usr.bin/perl/perl/Makefile
+++ b/gnu/usr.bin/perl/perl/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.18 1999/05/12 19:27:44 dt Exp $
+# $FreeBSD$
 #
 
 PROG=	perl
diff --git a/gnu/usr.bin/perl/pod/Makefile b/gnu/usr.bin/perl/pod/Makefile
index 949a9992ee7b..ffa559eeb9f7 100644
--- a/gnu/usr.bin/perl/pod/Makefile
+++ b/gnu/usr.bin/perl/pod/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 
 SUBDIR= pod2man pod2html pod2latex pod2text pod
diff --git a/gnu/usr.bin/perl/pod/Makefile.inc b/gnu/usr.bin/perl/pod/Makefile.inc
index e4e6ca2fdb84..1e3cbfe7fc72 100644
--- a/gnu/usr.bin/perl/pod/Makefile.inc
+++ b/gnu/usr.bin/perl/pod/Makefile.inc
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 
 PERL5SRC?=	${.CURDIR}/../../../../../contrib/perl5
diff --git a/gnu/usr.bin/perl/pod/pod/Makefile b/gnu/usr.bin/perl/pod/pod/Makefile
index 9905d0877765..618132c87cf9 100644
--- a/gnu/usr.bin/perl/pod/pod/Makefile
+++ b/gnu/usr.bin/perl/pod/pod/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.2 1998/10/11 18:13:42 markm Exp $
+# $FreeBSD$
 #
 
 PODS=	perl.pod perl5004delta.pod perlapio.pod perlbook.pod perlbot.pod \
diff --git a/gnu/usr.bin/perl/pod/pod2html/Makefile b/gnu/usr.bin/perl/pod/pod2html/Makefile
index e5f9443e0af1..77e1b1adc089 100644
--- a/gnu/usr.bin/perl/pod/pod2html/Makefile
+++ b/gnu/usr.bin/perl/pod/pod2html/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 
 PROG=	pod2html
diff --git a/gnu/usr.bin/perl/pod/pod2latex/Makefile b/gnu/usr.bin/perl/pod/pod2latex/Makefile
index 547a0bb0b324..3b67d0047692 100644
--- a/gnu/usr.bin/perl/pod/pod2latex/Makefile
+++ b/gnu/usr.bin/perl/pod/pod2latex/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 
 PROG=	pod2latex
diff --git a/gnu/usr.bin/perl/pod/pod2man/Makefile b/gnu/usr.bin/perl/pod/pod2man/Makefile
index 9a8dbccb8494..99f1ec40da68 100644
--- a/gnu/usr.bin/perl/pod/pod2man/Makefile
+++ b/gnu/usr.bin/perl/pod/pod2man/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 
 PROG=	pod2man
diff --git a/gnu/usr.bin/perl/pod/pod2text/Makefile b/gnu/usr.bin/perl/pod/pod2text/Makefile
index 7474a2ab2b5a..13a425c067d4 100644
--- a/gnu/usr.bin/perl/pod/pod2text/Makefile
+++ b/gnu/usr.bin/perl/pod/pod2text/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 
 PROG=	pod2text
diff --git a/gnu/usr.bin/perl/suidperl/Makefile b/gnu/usr.bin/perl/suidperl/Makefile
index 24a4892c3afc..8a0cea826c54 100644
--- a/gnu/usr.bin/perl/suidperl/Makefile
+++ b/gnu/usr.bin/perl/suidperl/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.6 1999/01/12 07:57:01 peter Exp $
+# $FreeBSD$
 #
 
 PROG=	suidperl
diff --git a/gnu/usr.bin/perl/utils/Makefile b/gnu/usr.bin/perl/utils/Makefile
index 565cae3b49bf..58a2ce7d30d9 100644
--- a/gnu/usr.bin/perl/utils/Makefile
+++ b/gnu/usr.bin/perl/utils/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 
 SUBDIR= c2ph h2ph h2xs perlbug perlcc perldoc pl2pm splain
diff --git a/gnu/usr.bin/perl/utils/Makefile.inc b/gnu/usr.bin/perl/utils/Makefile.inc
index 582f377541d4..6f8850df7895 100644
--- a/gnu/usr.bin/perl/utils/Makefile.inc
+++ b/gnu/usr.bin/perl/utils/Makefile.inc
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 
 PERL5SRC=	${.CURDIR}/../../../../../contrib/perl5
diff --git a/gnu/usr.bin/perl/utils/c2ph/Makefile b/gnu/usr.bin/perl/utils/c2ph/Makefile
index f5312f609796..0225a28f249a 100644
--- a/gnu/usr.bin/perl/utils/c2ph/Makefile
+++ b/gnu/usr.bin/perl/utils/c2ph/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 
 PROG=	c2ph
diff --git a/gnu/usr.bin/perl/utils/h2ph/Makefile b/gnu/usr.bin/perl/utils/h2ph/Makefile
index 9be7c9f0b2c1..ab7075d08103 100644
--- a/gnu/usr.bin/perl/utils/h2ph/Makefile
+++ b/gnu/usr.bin/perl/utils/h2ph/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.3 1999/03/18 19:39:07 julian Exp $
+# $FreeBSD$
 #
 
 PROG=	h2ph
diff --git a/gnu/usr.bin/perl/utils/h2xs/Makefile b/gnu/usr.bin/perl/utils/h2xs/Makefile
index b1c23f369026..fa635dbe8646 100644
--- a/gnu/usr.bin/perl/utils/h2xs/Makefile
+++ b/gnu/usr.bin/perl/utils/h2xs/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 
 PROG=	h2xs
diff --git a/gnu/usr.bin/perl/utils/perlbug/Makefile b/gnu/usr.bin/perl/utils/perlbug/Makefile
index d8cc174798ed..2d4399a3006b 100644
--- a/gnu/usr.bin/perl/utils/perlbug/Makefile
+++ b/gnu/usr.bin/perl/utils/perlbug/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.1 1998/09/09 07:20:30 markm Exp $
+# $FreeBSD$
 #
 
 PROG=	perlbug
diff --git a/gnu/usr.bin/perl/utils/perlcc/Makefile b/gnu/usr.bin/perl/utils/perlcc/Makefile
index 095ae8511553..02ce3a3ef077 100644
--- a/gnu/usr.bin/perl/utils/perlcc/Makefile
+++ b/gnu/usr.bin/perl/utils/perlcc/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 
 PROG=	perlcc
diff --git a/gnu/usr.bin/perl/utils/perldoc/Makefile b/gnu/usr.bin/perl/utils/perldoc/Makefile
index 75931562a764..5d55722414f4 100644
--- a/gnu/usr.bin/perl/utils/perldoc/Makefile
+++ b/gnu/usr.bin/perl/utils/perldoc/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 
 PROG=	perldoc
diff --git a/gnu/usr.bin/perl/utils/pl2pm/Makefile b/gnu/usr.bin/perl/utils/pl2pm/Makefile
index 18ef0df81d72..fea06a33d29e 100644
--- a/gnu/usr.bin/perl/utils/pl2pm/Makefile
+++ b/gnu/usr.bin/perl/utils/pl2pm/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 
 PROG=	pl2pm
diff --git a/gnu/usr.bin/perl/utils/splain/Makefile b/gnu/usr.bin/perl/utils/splain/Makefile
index 5dd9c2b36b75..c971ceb41047 100644
--- a/gnu/usr.bin/perl/utils/splain/Makefile
+++ b/gnu/usr.bin/perl/utils/splain/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 
 PROG=	splain
diff --git a/gnu/usr.bin/perl/x2p/Makefile b/gnu/usr.bin/perl/x2p/Makefile
index d4d322fbb4b7..2ded8338af01 100644
--- a/gnu/usr.bin/perl/x2p/Makefile
+++ b/gnu/usr.bin/perl/x2p/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 
 SUBDIR= a2pl s2pl find2pl
diff --git a/gnu/usr.bin/perl/x2p/Makefile.inc b/gnu/usr.bin/perl/x2p/Makefile.inc
index 29639b1917fd..fe3b7102b080 100644
--- a/gnu/usr.bin/perl/x2p/Makefile.inc
+++ b/gnu/usr.bin/perl/x2p/Makefile.inc
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 
 PERL5SRC=	${.CURDIR}/../../../../../contrib/perl5
diff --git a/gnu/usr.bin/perl/x2p/a2pl/Makefile b/gnu/usr.bin/perl/x2p/a2pl/Makefile
index 1ae1b74b78b4..005496f47558 100644
--- a/gnu/usr.bin/perl/x2p/a2pl/Makefile
+++ b/gnu/usr.bin/perl/x2p/a2pl/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.5 1998/09/16 17:25:52 markm Exp $
+# $FreeBSD$
 #
 
 PROG=	a2p
diff --git a/gnu/usr.bin/perl/x2p/find2pl/Makefile b/gnu/usr.bin/perl/x2p/find2pl/Makefile
index 84951ccff5e7..600aecedffdd 100644
--- a/gnu/usr.bin/perl/x2p/find2pl/Makefile
+++ b/gnu/usr.bin/perl/x2p/find2pl/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 
 PROG=	find2perl
diff --git a/gnu/usr.bin/perl/x2p/s2pl/Makefile b/gnu/usr.bin/perl/x2p/s2pl/Makefile
index 79bd46b1a2f2..9b1ad97f7034 100644
--- a/gnu/usr.bin/perl/x2p/s2pl/Makefile
+++ b/gnu/usr.bin/perl/x2p/s2pl/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 
 PROG=	s2p
diff --git a/gnu/usr.bin/rcs/CREDITS b/gnu/usr.bin/rcs/CREDITS
index e0fb955b3bbd..589e8b685091 100644
--- a/gnu/usr.bin/rcs/CREDITS
+++ b/gnu/usr.bin/rcs/CREDITS
@@ -21,4 +21,4 @@ Brendan Kehoe of Cygnus Support suggested rlog's -N option.
 Paul D. Smith of Data General suggested improvements in option
 and error processing.  Adam Hammer of Purdue QAed.
 
-$Id$
+$FreeBSD$
diff --git a/gnu/usr.bin/rcs/NEWS b/gnu/usr.bin/rcs/NEWS
index cda484eb4517..99208064bd32 100644
--- a/gnu/usr.bin/rcs/NEWS
+++ b/gnu/usr.bin/rcs/NEWS
@@ -1,6 +1,6 @@
 Recent changes to RCS (and possible future changes)
 
-	$Id$
+ $FreeBSD$
 
 	Copyright 1991, 1992, 1993, 1994, 1995 Paul Eggert
 	Distributed under license by the Free Software Foundation, Inc.
diff --git a/gnu/usr.bin/rcs/REFS b/gnu/usr.bin/rcs/REFS
index 8f326f9737d5..89fc823525ee 100644
--- a/gnu/usr.bin/rcs/REFS
+++ b/gnu/usr.bin/rcs/REFS
@@ -2,7 +2,7 @@ Here are references to RCS and related free software and documentation.
 Some of this information changes often; see the Frequently Asked Questions
 for more up-to-date references.
 
-	$Id$
+ $FreeBSD$
 
 
 Frequently Asked Questions (FAQs)
diff --git a/gnu/usr.bin/rcs/ci/ci.1 b/gnu/usr.bin/rcs/ci/ci.1
index 64e90efd6ca9..1378af222cb8 100644
--- a/gnu/usr.bin/rcs/ci/ci.1
+++ b/gnu/usr.bin/rcs/ci/ci.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $Id$
+.Id $FreeBSD$
 .ds i \&\s-1ISO\s0
 .ds r \&\s-1RCS\s0
 .ds u \&\s-1UTC\s0
diff --git a/gnu/usr.bin/rcs/ci/ci.c b/gnu/usr.bin/rcs/ci/ci.c
index b5cf15606461..749a4cf6dbe9 100644
--- a/gnu/usr.bin/rcs/ci/ci.c
+++ b/gnu/usr.bin/rcs/ci/ci.c
@@ -274,7 +274,7 @@ static struct hshentry newdelta;	/* new delta to be inserted	*/
 static struct stat workstat;
 static struct Symrev *assoclst, **nextassoc;
 
-mainProg(ciId, "ci", "$Id$")
+mainProg(ciId, "ci", "$FreeBSD$")
 {
 	static char const cmdusage[] =
 		"\nci usage: ci -{fIklMqru}[rev] -d[date] -mmsg -{nN}name -sstate -ttext -T -Vn -wwho -xsuff -zzone file ...";
diff --git a/gnu/usr.bin/rcs/co/co.1 b/gnu/usr.bin/rcs/co/co.1
index 5bc62a45f526..2aea3ad1b40d 100644
--- a/gnu/usr.bin/rcs/co/co.1
+++ b/gnu/usr.bin/rcs/co/co.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $Id$
+.Id $FreeBSD$
 .ds i \&\s-1ISO\s0
 .ds r \&\s-1RCS\s0
 .ds u \&\s-1UTC\s0
diff --git a/gnu/usr.bin/rcs/co/co.c b/gnu/usr.bin/rcs/co/co.c
index 4165df2c02c0..51cb2b277927 100644
--- a/gnu/usr.bin/rcs/co/co.c
+++ b/gnu/usr.bin/rcs/co/co.c
@@ -191,7 +191,7 @@ static struct hshentries *gendeltas;	/* deltas to be generated	*/
 static struct hshentry *targetdelta;	/* final delta to be generated	*/
 static struct stat workstat;
 
-mainProg(coId, "co", "$Id: co.c,v 1.8 1997/02/22 15:47:21 peter Exp $")
+mainProg(coId, "co", "$FreeBSD$")
 {
 	static char const cmdusage[] =
 		"\nco usage: co -{fIlMpqru}[rev] -ddate -jjoins -ksubst -sstate -T -w[who] -Vn -xsuff -zzone file ...";
diff --git a/gnu/usr.bin/rcs/doc/rcs.ms b/gnu/usr.bin/rcs/doc/rcs.ms
index e89ae70df051..f6b0db300330 100644
--- a/gnu/usr.bin/rcs/doc/rcs.ms
+++ b/gnu/usr.bin/rcs/doc/rcs.ms
@@ -18,7 +18,7 @@
 .de Id
 .ND \\$4
 ..
-.Id $Id$
+.Id $FreeBSD$
 .RP
 .TL
 RCS\*-A System for Version Control
diff --git a/gnu/usr.bin/rcs/ident/ident.1 b/gnu/usr.bin/rcs/ident/ident.1
index 004db3aa7deb..253a2ce72724 100644
--- a/gnu/usr.bin/rcs/ident/ident.1
+++ b/gnu/usr.bin/rcs/ident/ident.1
@@ -3,7 +3,7 @@
 .ds Dt \\$4
 .ds iD \\$3 \\$4 \\$5 \\$6 \\$7
 ..
-.Id $Id$
+.Id $FreeBSD$
 .ds r \&\s-1RCS\s0
 .ds u \&\s-1UTC\s0
 .if n .ds - \%--
diff --git a/gnu/usr.bin/rcs/ident/ident.c b/gnu/usr.bin/rcs/ident/ident.c
index 2f1bbd4ab21e..1239bd8b22b3 100644
--- a/gnu/usr.bin/rcs/ident/ident.c
+++ b/gnu/usr.bin/rcs/ident/ident.c
@@ -102,7 +102,7 @@ static int match P((FILE*));
 static int scanfile P((FILE*,char const*,int));
 static void reportError P((char const*));
 
-mainProg(identId, "ident", "$Id$")
+mainProg(identId, "ident", "$FreeBSD$")
 /*  Ident searches the named files for all occurrences
  *  of the pattern $@: text $ where @ is a keyword.
  */
diff --git a/gnu/usr.bin/rcs/lib/conf.h b/gnu/usr.bin/rcs/lib/conf.h
index 907c9f8e837b..b60e3ce3aa51 100644
--- a/gnu/usr.bin/rcs/lib/conf.h
+++ b/gnu/usr.bin/rcs/lib/conf.h
@@ -1,6 +1,6 @@
 /* RCS compile-time configuration */
 
-	/* $Id$ */
+	/* $FreeBSD$ */
 
 /*
  * This file is generated automatically.
diff --git a/gnu/usr.bin/rcs/lib/maketime.c b/gnu/usr.bin/rcs/lib/maketime.c
index 697929d0ded7..0f83bf5690d6 100644
--- a/gnu/usr.bin/rcs/lib/maketime.c
+++ b/gnu/usr.bin/rcs/lib/maketime.c
@@ -43,7 +43,7 @@ Report problems and direct all questions to:
 #include "maketime.h"
 
 char const maketId[]
-  = "$Id$";
+  = "$FreeBSD$";
 
 static int isleap P((int));
 static int month_days P((struct tm const*));
diff --git a/gnu/usr.bin/rcs/lib/merger.c b/gnu/usr.bin/rcs/lib/merger.c
index abd7c9bb9237..8f1d610d5f56 100644
--- a/gnu/usr.bin/rcs/lib/merger.c
+++ b/gnu/usr.bin/rcs/lib/merger.c
@@ -28,7 +28,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(mergerId, "$Id$")
+libId(mergerId, "$FreeBSD$")
 
 	static char const *normalize_arg P((char const*,char**));
 	static char const *
diff --git a/gnu/usr.bin/rcs/lib/partime.c b/gnu/usr.bin/rcs/lib/partime.c
index cb27bceb3e6d..05b010854950 100644
--- a/gnu/usr.bin/rcs/lib/partime.c
+++ b/gnu/usr.bin/rcs/lib/partime.c
@@ -46,7 +46,7 @@ Report problems and direct all questions to:
 #include "partime.h"
 
 char const partimeId[]
-  = "$Id$";
+  = "$FreeBSD$";
 
 
 /* Lookup tables for names of months, weekdays, time zones.  */
diff --git a/gnu/usr.bin/rcs/lib/rcsbase.h b/gnu/usr.bin/rcs/lib/rcsbase.h
index 918f1b9a470d..9f2f68cc8b6b 100644
--- a/gnu/usr.bin/rcs/lib/rcsbase.h
+++ b/gnu/usr.bin/rcs/lib/rcsbase.h
@@ -1,6 +1,6 @@
 /* RCS common definitions and data structures */
 
-#define RCSBASE "$Id: rcsbase.h,v 1.8 1997/02/22 15:47:33 peter Exp $"
+#define RCSBASE "$FreeBSD$"
 
 /* Copyright 1982, 1988, 1989 Walter Tichy
    Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert
diff --git a/gnu/usr.bin/rcs/lib/rcsedit.c b/gnu/usr.bin/rcs/lib/rcsedit.c
index e3f714bc840f..855790a12926 100644
--- a/gnu/usr.bin/rcs/lib/rcsedit.c
+++ b/gnu/usr.bin/rcs/lib/rcsedit.c
@@ -201,7 +201,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(editId, "$Id: rcsedit.c,v 1.8 1997/02/22 15:47:35 peter Exp $")
+libId(editId, "$FreeBSD$")
 
 static void editEndsPrematurely P((void)) exiting;
 static void editLineNumberOverflow P((void)) exiting;
diff --git a/gnu/usr.bin/rcs/lib/rcsfcmp.c b/gnu/usr.bin/rcs/lib/rcsfcmp.c
index 588756faa8ad..ef0529001b87 100644
--- a/gnu/usr.bin/rcs/lib/rcsfcmp.c
+++ b/gnu/usr.bin/rcs/lib/rcsfcmp.c
@@ -118,7 +118,7 @@ Report problems and direct all questions to:
 
 #include  "rcsbase.h"
 
-libId(fcmpId, "$Id$")
+libId(fcmpId, "$FreeBSD$")
 
 	static int discardkeyval P((int,RILE*));
 	static int
diff --git a/gnu/usr.bin/rcs/lib/rcsfnms.c b/gnu/usr.bin/rcs/lib/rcsfnms.c
index 2de1c13e6e9c..7d833bb1f80b 100644
--- a/gnu/usr.bin/rcs/lib/rcsfnms.c
+++ b/gnu/usr.bin/rcs/lib/rcsfnms.c
@@ -177,7 +177,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(fnmsId, "$Id: rcsfnms.c,v 1.8 1997/08/19 11:17:37 peter Exp $")
+libId(fnmsId, "$FreeBSD$")
 
 static char const *bindex P((char const*,int));
 static int fin2open P((char const*, size_t, char const*, size_t, char const*, size_t, RILE*(*)P((struct buf*,struct stat*,int)), int));
diff --git a/gnu/usr.bin/rcs/lib/rcsgen.c b/gnu/usr.bin/rcs/lib/rcsgen.c
index 4301de749e3c..35d8702a34f8 100644
--- a/gnu/usr.bin/rcs/lib/rcsgen.c
+++ b/gnu/usr.bin/rcs/lib/rcsgen.c
@@ -140,7 +140,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(genId, "$Id$")
+libId(genId, "$FreeBSD$")
 
 int interactiveflag;  /* Should we act as if stdin is a tty?  */
 struct buf curlogbuf;  /* buffer for current log message */
diff --git a/gnu/usr.bin/rcs/lib/rcskeep.c b/gnu/usr.bin/rcs/lib/rcskeep.c
index ebc369e3a043..4a90f851e615 100644
--- a/gnu/usr.bin/rcs/lib/rcskeep.c
+++ b/gnu/usr.bin/rcs/lib/rcskeep.c
@@ -98,7 +98,7 @@ Report problems and direct all questions to:
 
 #include  "rcsbase.h"
 
-libId(keepId, "$Id: rcskeep.c,v 1.6 1997/02/22 15:47:38 peter Exp $")
+libId(keepId, "$FreeBSD$")
 
 static int badly_terminated P((void));
 static int checknum P((char const*));
diff --git a/gnu/usr.bin/rcs/lib/rcskeys.c b/gnu/usr.bin/rcs/lib/rcskeys.c
index 6d0afb328489..db6f9c90a934 100644
--- a/gnu/usr.bin/rcs/lib/rcskeys.c
+++ b/gnu/usr.bin/rcs/lib/rcskeys.c
@@ -63,7 +63,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(keysId, "$Id: rcskeys.c,v 1.10 1997/02/22 15:47:38 peter Exp $")
+libId(keysId, "$FreeBSD$")
 
 
 char const *Keyword[] = {
diff --git a/gnu/usr.bin/rcs/lib/rcslex.c b/gnu/usr.bin/rcs/lib/rcslex.c
index 95c96c23612d..7a11f79b46c8 100644
--- a/gnu/usr.bin/rcs/lib/rcslex.c
+++ b/gnu/usr.bin/rcs/lib/rcslex.c
@@ -168,7 +168,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(lexId, "$Id$")
+libId(lexId, "$FreeBSD$")
 
 static char *checkidentifier P((char*,int,int));
 static void errsay P((char const*));
diff --git a/gnu/usr.bin/rcs/lib/rcsmap.c b/gnu/usr.bin/rcs/lib/rcsmap.c
index 0d6d64d448ca..89fb08daf364 100644
--- a/gnu/usr.bin/rcs/lib/rcsmap.c
+++ b/gnu/usr.bin/rcs/lib/rcsmap.c
@@ -29,7 +29,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(mapId, "$Id$")
+libId(mapId, "$FreeBSD$")
 
 /* map of character types */
 /* ISO 8859/1 (Latin-1) */
diff --git a/gnu/usr.bin/rcs/lib/rcsrev.c b/gnu/usr.bin/rcs/lib/rcsrev.c
index 8881648ed0cb..12c6c43006ac 100644
--- a/gnu/usr.bin/rcs/lib/rcsrev.c
+++ b/gnu/usr.bin/rcs/lib/rcsrev.c
@@ -105,7 +105,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(revId, "$Id$")
+libId(revId, "$FreeBSD$")
 
 static char const *branchtip P((char const*));
 static char const *lookupsym P((char const*));
diff --git a/gnu/usr.bin/rcs/lib/rcssyn.c b/gnu/usr.bin/rcs/lib/rcssyn.c
index e6ccb25bdb1e..07f155bfb8ea 100644
--- a/gnu/usr.bin/rcs/lib/rcssyn.c
+++ b/gnu/usr.bin/rcs/lib/rcssyn.c
@@ -153,7 +153,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(synId, "$Id$")
+libId(synId, "$FreeBSD$")
 
 static char const *getkeyval P((char const*,enum tokens,int));
 static int getdelta P((void));
diff --git a/gnu/usr.bin/rcs/lib/rcstime.c b/gnu/usr.bin/rcs/lib/rcstime.c
index 70a013b347b6..cfd466096ff7 100644
--- a/gnu/usr.bin/rcs/lib/rcstime.c
+++ b/gnu/usr.bin/rcs/lib/rcstime.c
@@ -30,7 +30,7 @@ Report problems and direct all questions to:
 #include "partime.h"
 #include "maketime.h"
 
-libId(rcstimeId, "$Id$")
+libId(rcstimeId, "$FreeBSD$")
 
 static long zone_offset; /* seconds east of UTC, or TM_LOCAL_ZONE */
 static int use_zone_offset; /* if zero, use UTC without zone indication */
diff --git a/gnu/usr.bin/rcs/lib/rcsutil.c b/gnu/usr.bin/rcs/lib/rcsutil.c
index 3b2a46fcdb39..e10afff6c20d 100644
--- a/gnu/usr.bin/rcs/lib/rcsutil.c
+++ b/gnu/usr.bin/rcs/lib/rcsutil.c
@@ -186,7 +186,7 @@ Report problems and direct all questions to:
 
 #include "rcsbase.h"
 
-libId(utilId, "$Id: rcsutil.c,v 1.6 1997/02/22 15:47:43 peter Exp $")
+libId(utilId, "$FreeBSD$")
 
 #if !has_memcmp
 	int
diff --git a/gnu/usr.bin/rcs/merge/merge.1 b/gnu/usr.bin/rcs/merge/merge.1
index 73ae65cec38b..a4fd35b7986a 100644
--- a/gnu/usr.bin/rcs/merge/merge.1
+++ b/gnu/usr.bin/rcs/merge/merge.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $Id: merge.1,v 1.4 1997/02/22 15:47:50 peter Exp $
+.Id $FreeBSD$
 .ds r \&\s-1RCS\s0
 .TH MERGE 1 \*(Dt GNU
 .SH NAME
diff --git a/gnu/usr.bin/rcs/merge/merge.c b/gnu/usr.bin/rcs/merge/merge.c
index fabd622bd300..aa127bf1c8ec 100644
--- a/gnu/usr.bin/rcs/merge/merge.c
+++ b/gnu/usr.bin/rcs/merge/merge.c
@@ -41,7 +41,7 @@ badoption(a)
 }
 
 
-mainProg(mergeId, "merge", "$Id$")
+mainProg(mergeId, "merge", "$FreeBSD$")
 {
 	register char const *a;
 	char const *arg[3], *label[3], *edarg = 0;
diff --git a/gnu/usr.bin/rcs/rcs/rcs.1 b/gnu/usr.bin/rcs/rcs/rcs.1
index 97dec20c643f..37fb59fea068 100644
--- a/gnu/usr.bin/rcs/rcs/rcs.1
+++ b/gnu/usr.bin/rcs/rcs/rcs.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $Id$
+.Id $FreeBSD$
 .ds r \&\s-1RCS\s0
 .if n .ds - \%--
 .if t .ds - \(em
diff --git a/gnu/usr.bin/rcs/rcs/rcs.c b/gnu/usr.bin/rcs/rcs/rcs.c
index b46bdf4b29a5..dfb622a6f808 100644
--- a/gnu/usr.bin/rcs/rcs/rcs.c
+++ b/gnu/usr.bin/rcs/rcs/rcs.c
@@ -275,7 +275,7 @@ static struct delrevpair delrev;
 static struct hshentry *cuthead, *cuttail, *delstrt;
 static struct hshentries *gendeltas;
 
-mainProg(rcsId, "rcs", "$Id$")
+mainProg(rcsId, "rcs", "$FreeBSD$")
 {
 	static char const cmdusage[] =
 		"\nrcs usage: rcs -{ae}logins -Afile -{blu}[rev] -cstring -{iILqTU} -ksubst -mrev:msg -{nN}name[:[rev]] -orange -sstate[:rev] -t[text] -Vn -xsuff -zzone file ...";
diff --git a/gnu/usr.bin/rcs/rcs/rcsfile.5 b/gnu/usr.bin/rcs/rcs/rcsfile.5
index f3be6c5490e7..f3a6dac6fb5f 100644
--- a/gnu/usr.bin/rcs/rcs/rcsfile.5
+++ b/gnu/usr.bin/rcs/rcs/rcsfile.5
@@ -5,7 +5,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $Id$
+.Id $FreeBSD$
 .ds r \s-1RCS\s0
 .if n .ds - \%--
 .if t .ds - \(em
diff --git a/gnu/usr.bin/rcs/rcs/rcsintro.1 b/gnu/usr.bin/rcs/rcs/rcsintro.1
index 715e03b21ece..edcd9ee9389d 100644
--- a/gnu/usr.bin/rcs/rcs/rcsintro.1
+++ b/gnu/usr.bin/rcs/rcs/rcsintro.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $Id$
+.Id $FreeBSD$
 .ds r \&\s-1RCS\s0
 .if n .ds - \%--
 .if t .ds - \(em
diff --git a/gnu/usr.bin/rcs/rcsclean/rcsclean.1 b/gnu/usr.bin/rcs/rcsclean/rcsclean.1
index e671a5eccecf..3111915455a6 100644
--- a/gnu/usr.bin/rcs/rcsclean/rcsclean.1
+++ b/gnu/usr.bin/rcs/rcsclean/rcsclean.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $Id$
+.Id $FreeBSD$
 .ds r \&\s-1RCS\s0
 .if n .ds - \%--
 .if t .ds - \(em
diff --git a/gnu/usr.bin/rcs/rcsclean/rcsclean.c b/gnu/usr.bin/rcs/rcsclean/rcsclean.c
index c321270bed3e..32c8e7dfbc63 100644
--- a/gnu/usr.bin/rcs/rcsclean/rcsclean.c
+++ b/gnu/usr.bin/rcs/rcsclean/rcsclean.c
@@ -38,7 +38,7 @@ static void cleanup P((void));
 static RILE *workptr;
 static int exitstatus;
 
-mainProg(rcscleanId, "rcsclean", "$Id$")
+mainProg(rcscleanId, "rcsclean", "$FreeBSD$")
 {
 	static char const usage[] =
 		"\nrcsclean: usage: rcsclean -ksubst -{nqru}[rev] -T -Vn -xsuff -zzone file ...";
diff --git a/gnu/usr.bin/rcs/rcsdiff/rcsdiff.1 b/gnu/usr.bin/rcs/rcsdiff/rcsdiff.1
index 5dff7d9f2e8a..74117c270e6c 100644
--- a/gnu/usr.bin/rcs/rcsdiff/rcsdiff.1
+++ b/gnu/usr.bin/rcs/rcsdiff/rcsdiff.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $Id$
+.Id $FreeBSD$
 .ds r \&\s-1RCS\s0
 .if n .ds - \%--
 .if t .ds - \(em
diff --git a/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c b/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c
index 371dd735667e..7d3c0a37f66a 100644
--- a/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c
+++ b/gnu/usr.bin/rcs/rcsdiff/rcsdiff.c
@@ -151,7 +151,7 @@ static int exitstatus;
 static RILE *workptr;
 static struct stat workstat;
 
-mainProg(rcsdiffId, "rcsdiff", "$Id$")
+mainProg(rcsdiffId, "rcsdiff", "$FreeBSD$")
 {
     static char const cmdusage[] =
 	    "\nrcsdiff usage: rcsdiff -ksubst -q -rrev1 [-rrev2] -Vn -xsuff -zzone [diff options] file ...";
diff --git a/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1 b/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1
index 69ca60b0b304..3f513c4d65ad 100644
--- a/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1
+++ b/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $Id$
+.Id $FreeBSD$
 .ds r \s-1RCS\s0
 .TH RCSFREEZE 1 \*(Dt GNU
 .SH NAME
diff --git a/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh b/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh
index 4c3945e25d60..9cb34bbdb83a 100644
--- a/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh
+++ b/gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh
@@ -2,7 +2,7 @@
 
 # rcsfreeze - assign a symbolic revision number to a configuration of RCS files
 
-#	$Id$
+# $FreeBSD$
 
 #       The idea is to run rcsfreeze each time a new version is checked
 #       in. A unique symbolic revision number (C_[number], where number
diff --git a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1 b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1
index d962c2240daa..aff6f666dabb 100644
--- a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1
+++ b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $Id$
+.Id $FreeBSD$
 .ds r \&\s-1RCS\s0
 .if n .ds - \%--
 .if t .ds - \(em
diff --git a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
index 7555343f3337..e09dc2469867 100644
--- a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
+++ b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
@@ -117,7 +117,7 @@ Report problems and direct all questions to:
 
 static char const co[] = CO;
 
-mainProg(rcsmergeId, "rcsmerge", "$Id$")
+mainProg(rcsmergeId, "rcsmerge", "$FreeBSD$")
 {
 	static char const cmdusage[] =
 		"\nrcsmerge usage: rcsmerge -rrev1 [-rrev2] -ksubst -{pq}[rev] -Vn -xsuff -zzone file";
diff --git a/gnu/usr.bin/rcs/rcstest b/gnu/usr.bin/rcs/rcstest
index 36b63e619fc0..75165f1bbd59 100755
--- a/gnu/usr.bin/rcs/rcstest
+++ b/gnu/usr.bin/rcs/rcstest
@@ -15,7 +15,7 @@
 
 # The current directory and ./RCS must be readable, writable, and searchable.
 
-#	$Id$
+# $FreeBSD$
 
 
 #    Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert
diff --git a/gnu/usr.bin/rcs/rlog/rlog.1 b/gnu/usr.bin/rcs/rlog/rlog.1
index 953617cecdc8..26bf08a2bcb0 100644
--- a/gnu/usr.bin/rcs/rlog/rlog.1
+++ b/gnu/usr.bin/rcs/rlog/rlog.1
@@ -2,7 +2,7 @@
 .ds Rv \\$3
 .ds Dt \\$4
 ..
-.Id $Id$
+.Id $FreeBSD$
 .ds i \&\s-1ISO\s0
 .ds r \&\s-1RCS\s0
 .ds u \&\s-1UTC\s0
diff --git a/gnu/usr.bin/rcs/rlog/rlog.c b/gnu/usr.bin/rcs/rlog/rlog.c
index 75e68c320d24..f8872febb971 100644
--- a/gnu/usr.bin/rcs/rlog/rlog.c
+++ b/gnu/usr.bin/rcs/rlog/rlog.c
@@ -218,7 +218,7 @@ static struct rcslockers *lockerlist;
 static struct stateattri *statelist;
 
 
-mainProg(rlogId, "rlog", "$Id$")
+mainProg(rlogId, "rlog", "$FreeBSD$")
 {
 	static char const cmdusage[] =
 		"\nrlog usage: rlog -{bhLNRt} -v[string] -ddates -l[lockers] -r[revs] -sstates -Vn -w[logins] -xsuff -zzone file ...";
diff --git a/gnu/usr.bin/sdiff/Makefile b/gnu/usr.bin/sdiff/Makefile
index 9443fe5019a9..2312bb21b3b3 100644
--- a/gnu/usr.bin/sdiff/Makefile
+++ b/gnu/usr.bin/sdiff/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.7 1997/02/22 15:45:24 peter Exp $
+# $FreeBSD$
 
 .PATH:  ${.CURDIR}/../../../contrib/diff
 
diff --git a/gnu/usr.bin/send-pr/send-pr.sh b/gnu/usr.bin/send-pr/send-pr.sh
index 2cc28fd8691c..a76e3f544bb4 100644
--- a/gnu/usr.bin/send-pr/send-pr.sh
+++ b/gnu/usr.bin/send-pr/send-pr.sh
@@ -20,7 +20,7 @@
 # along with GNU GNATS; see the file COPYING.  If not, write to
 # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #
-# $Id: send-pr.sh,v 1.10 1999/03/24 17:06:47 steve Exp $
+# $FreeBSD$
 
 # The version of this send-pr.
 VERSION=3.2
diff --git a/gnu/usr.bin/tar/tar.1 b/gnu/usr.bin/tar/tar.1
index f1e5593513b5..87904cf413a0 100644
--- a/gnu/usr.bin/tar/tar.1
+++ b/gnu/usr.bin/tar/tar.1
@@ -4,7 +4,7 @@
 .\"	Written by John F. Woods <jfw@jfwhome.funhouse.com>
 .\"	Updated by Robert Eckardt <roberte@mep.ruhr-uni-bochum.de>
 .\"
-.\"	$Id: tar.1,v 1.19 1999/03/29 11:25:45 obrien Exp $
+.\" $FreeBSD$
 .\"
 .Dd 25 August 1997
 .Os FreeBSD
diff --git a/gnu/usr.bin/texinfo/Makefile b/gnu/usr.bin/texinfo/Makefile
index bd696f27ef04..2f1a1dc1e282 100644
--- a/gnu/usr.bin/texinfo/Makefile
+++ b/gnu/usr.bin/texinfo/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 
 SUBDIR= libtxi libintl makeinfo info install-info doc
diff --git a/gnu/usr.bin/texinfo/Makefile.inc b/gnu/usr.bin/texinfo/Makefile.inc
index 08a475c92413..d071bf0b4714 100644
--- a/gnu/usr.bin/texinfo/Makefile.inc
+++ b/gnu/usr.bin/texinfo/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.8 1999/01/14 20:00:26 markm Exp $
+# $FreeBSD$
 
 TXIDIR=		${.CURDIR}/../../../../contrib/texinfo
 
diff --git a/gnu/usr.bin/texinfo/doc/Makefile b/gnu/usr.bin/texinfo/doc/Makefile
index 65e8fa6a621a..2dfb17ff701a 100644
--- a/gnu/usr.bin/texinfo/doc/Makefile
+++ b/gnu/usr.bin/texinfo/doc/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.9 1999/01/14 20:00:43 markm Exp $
+# $FreeBSD$
 
 INFO=	info info-stnd texinfo
 
diff --git a/gnu/usr.bin/texinfo/info/Makefile b/gnu/usr.bin/texinfo/info/Makefile
index 2e291d6a2c7f..f8c0de7c3f6b 100644
--- a/gnu/usr.bin/texinfo/info/Makefile
+++ b/gnu/usr.bin/texinfo/info/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	info
 NOMAN=  yes
diff --git a/gnu/usr.bin/texinfo/install-info/Makefile b/gnu/usr.bin/texinfo/install-info/Makefile
index 114baaab228f..d1f62c600070 100644
--- a/gnu/usr.bin/texinfo/install-info/Makefile
+++ b/gnu/usr.bin/texinfo/install-info/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	install-info
 
diff --git a/gnu/usr.bin/texinfo/install-info/install-info.1 b/gnu/usr.bin/texinfo/install-info/install-info.1
index d9ea5f8d1974..2c61d793d8c2 100644
--- a/gnu/usr.bin/texinfo/install-info/install-info.1
+++ b/gnu/usr.bin/texinfo/install-info/install-info.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: install-info.1,v 1.1 1997/08/29 09:10:22 obrien Exp $
+.\" $FreeBSD$
 .\"
 .\" .TH install-info 1
 .Dd August 29, 1997
diff --git a/gnu/usr.bin/texinfo/libintl/Makefile b/gnu/usr.bin/texinfo/libintl/Makefile
index 0bce892fccdd..a0347389c898 100644
--- a/gnu/usr.bin/texinfo/libintl/Makefile
+++ b/gnu/usr.bin/texinfo/libintl/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 LIB=	intl
 INTERNALLIB= true
diff --git a/gnu/usr.bin/texinfo/libtxi/Makefile b/gnu/usr.bin/texinfo/libtxi/Makefile
index 5e83853a11b1..217b5849186d 100644
--- a/gnu/usr.bin/texinfo/libtxi/Makefile
+++ b/gnu/usr.bin/texinfo/libtxi/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 LIB=	txi
 INTERNALLIB= true
diff --git a/gnu/usr.bin/texinfo/makeinfo/Makefile b/gnu/usr.bin/texinfo/makeinfo/Makefile
index 2037f4c09011..d8f420fc94c8 100644
--- a/gnu/usr.bin/texinfo/makeinfo/Makefile
+++ b/gnu/usr.bin/texinfo/makeinfo/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.8 1999/01/14 20:00:46 markm Exp $
+# $FreeBSD$
 
 PROG=	makeinfo
 NOMAN=	yes
diff --git a/gnu/usr.sbin/Makefile b/gnu/usr.sbin/Makefile
index 980b234ba306..cd90af77fde7 100644
--- a/gnu/usr.sbin/Makefile
+++ b/gnu/usr.sbin/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 
 SUBDIR=
diff --git a/gnu/usr.sbin/Makefile.inc b/gnu/usr.sbin/Makefile.inc
index 1fa8c0e074f6..8c6b79e955f7 100644
--- a/gnu/usr.sbin/Makefile.inc
+++ b/gnu/usr.sbin/Makefile.inc
@@ -1,3 +1,3 @@
-#	$Id$
+# $FreeBSD$
 
 BINDIR?=	/usr/sbin
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index d050f0d02b2a..da9fb902f567 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -1,4 +1,4 @@
-# $Id: make.conf,v 1.82 1999/07/28 20:28:54 nik Exp $
+# $FreeBSD$
 #
 # This file, if present, will be read by make (see /usr/share/mk/sys.mk).
 # It allows you to override macro definitions to make without changing
diff --git a/share/examples/pppd/ppp.deny.sample b/share/examples/pppd/ppp.deny.sample
index f1d7c834572d..6d06f4fac32e 100644
--- a/share/examples/pppd/ppp.deny.sample
+++ b/share/examples/pppd/ppp.deny.sample
@@ -1,4 +1,4 @@
-#	$Id:$
+# $FreeBSD$
 #
 # list of users disallowed any pppd access via 'system
 # password login'.
diff --git a/share/examples/pppd/ppp.shells.sample b/share/examples/pppd/ppp.shells.sample
index 4c5149e785a9..7d26d62a5054 100644
--- a/share/examples/pppd/ppp.shells.sample
+++ b/share/examples/pppd/ppp.shells.sample
@@ -1,4 +1,4 @@
-#	$Id:$
+# $FreeBSD$
 #
 # List of acceptable shells for pppd(8).
 # Pppd will not accept a system password login
diff --git a/usr.bin/makewhatis/makewhatis.local.8 b/usr.bin/makewhatis/makewhatis.local.8
index 8f7bc5b506fe..81a6e1fb66b3 100644
--- a/usr.bin/makewhatis/makewhatis.local.8
+++ b/usr.bin/makewhatis/makewhatis.local.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: makewhatis.local.8,v 1.6 1997/06/23 04:51:30 steve Exp $
+.\" $FreeBSD$
 .Dd April 26, 1996
 .Dt MAKEWHATIS.LOCAL 8
 .Os FreeBSD 2.2
diff --git a/usr.bin/makewhatis/makewhatis.local.sh b/usr.bin/makewhatis/makewhatis.local.sh
index 56ebc7e42d53..8be25300b75d 100644
--- a/usr.bin/makewhatis/makewhatis.local.sh
+++ b/usr.bin/makewhatis/makewhatis.local.sh
@@ -33,7 +33,7 @@
 #
 # PS: this wrapper works also for catman(1)
 #
-# $Id: makewhatis.local.sh,v 1.5 1997/02/22 15:47:03 peter Exp $
+# $FreeBSD$
 
 PATH=/bin:/usr/bin:$PATH; export PATH
 opt= dirs= localdirs=