$Id$ -> $FreeBSD$

191 files changed, 191 insertions, 191 deletions

diff --git a/libexec/Makefile b/libexec/Makefile
index 991501a..9301dc0 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile,v 1.36 1998/09/05 08:33:10 jb Exp $
+# $FreeBSD$
 
 # Present but disabled: kpasswdd
 SUBDIR=	atrun bootpd comsat fingerd ftpd getNAME getty \
diff --git a/libexec/atrun/LEGAL b/libexec/atrun/LEGAL
index 2cd9453..af8be57 100644
--- a/libexec/atrun/LEGAL
+++ b/libexec/atrun/LEGAL
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 -----BEGIN PGP SIGNED MESSAGE-----
 
diff --git a/libexec/atrun/Makefile b/libexec/atrun/Makefile
index 118bed1..563e101 100644
--- a/libexec/atrun/Makefile
+++ b/libexec/atrun/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 MAINSRC= ${.CURDIR}/../../usr.bin/at
 
diff --git a/libexec/atrun/atrun.c b/libexec/atrun/atrun.c
index d8e3a86..ae9ebc9 100644
--- a/libexec/atrun/atrun.c
+++ b/libexec/atrun/atrun.c
@@ -25,7 +25,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: atrun.c,v 1.12 1997/11/20 07:21:50 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /* System Headers */
diff --git a/libexec/atrun/atrun.man b/libexec/atrun/atrun.man
index 5f7d810..a157f2a 100644
--- a/libexec/atrun/atrun.man
+++ b/libexec/atrun/atrun.man
@@ -1,4 +1,4 @@
-.\" $Id: atrun.man,v 1.5 1998/07/01 05:47:58 jkoshy Exp $
+.\" $FreeBSD$
 .Dd April 12, 1995
 .Dt ATRUN 8
 .Os FreeBSD 2.1
diff --git a/libexec/atrun/gloadavg.c b/libexec/atrun/gloadavg.c
index 40e8713..6cffe5a 100644
--- a/libexec/atrun/gloadavg.c
+++ b/libexec/atrun/gloadavg.c
@@ -25,7 +25,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #ifndef __FreeBSD__
diff --git a/libexec/atrun/gloadavg.h b/libexec/atrun/gloadavg.h
index 24c4e12..48890ce 100644
--- a/libexec/atrun/gloadavg.h
+++ b/libexec/atrun/gloadavg.h
@@ -25,5 +25,5 @@
 
 double gloadavg(void);
 #if 0
-static char atrun_h_rcsid[] = "$Id$";
+static char atrun_h_rcsid[] = "$FreeBSD$";
 #endif
diff --git a/libexec/bootpd/Announce b/libexec/bootpd/Announce
index a605c6a..60838d5 100644
--- a/libexec/bootpd/Announce
+++ b/libexec/bootpd/Announce
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 This is an enhanced version of the CMU BOOTP server which was derived
 from the original BOOTP server created by Bill Croft at Stanford.
diff --git a/libexec/bootpd/Changes b/libexec/bootpd/Changes
index 23310e1..d797ea1 100644
--- a/libexec/bootpd/Changes
+++ b/libexec/bootpd/Changes
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 Changes, most recent first
 Date, <email> Real Name
diff --git a/libexec/bootpd/Makefile b/libexec/bootpd/Makefile
index bc07225..f428be8 100644
--- a/libexec/bootpd/Makefile
+++ b/libexec/bootpd/Makefile
@@ -1,5 +1,5 @@
 # bootpd/Makefile
-# $Id$
+# $FreeBSD$
 
 PROG=	bootpd
 CFLAGS+= -DETC_ETHERS
diff --git a/libexec/bootpd/Makefile.UNIX b/libexec/bootpd/Makefile.UNIX
index 50187da..5b2c186 100644
--- a/libexec/bootpd/Makefile.UNIX
+++ b/libexec/bootpd/Makefile.UNIX
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 #
 # Makefile for the BOOTP programs:
 #   bootpd	- BOOTP server daemon
diff --git a/libexec/bootpd/Makefile.inc b/libexec/bootpd/Makefile.inc
index d055f52..829da30 100644
--- a/libexec/bootpd/Makefile.inc
+++ b/libexec/bootpd/Makefile.inc
@@ -1,3 +1,3 @@
-# $Id$
+# $FreeBSD$
 
 BINDIR?=	/usr/libexec
diff --git a/libexec/bootpd/Problems b/libexec/bootpd/Problems
index bec9ac0..c7f9951 100644
--- a/libexec/bootpd/Problems
+++ b/libexec/bootpd/Problems
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 Common problems and ways to work around them:
 
diff --git a/libexec/bootpd/README b/libexec/bootpd/README
index ddfaebe..a88cca5 100644
--- a/libexec/bootpd/README
+++ b/libexec/bootpd/README
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 This is an enhanced version of the CMU BOOTP server which was derived
 from the original BOOTP server created by Bill Croft at Stanford.
diff --git a/libexec/bootpd/bootp.h b/libexec/bootpd/bootp.h
index 88f7ed2..6ff5680 100644
--- a/libexec/bootpd/bootp.h
+++ b/libexec/bootpd/bootp.h
@@ -23,7 +23,7 @@ SOFTWARE.
 /*
  * Bootstrap Protocol (BOOTP).  RFC951 and RFC1395.
  *
- * $Id$
+ * $FreeBSD$
  *
  *
  * This file specifies the "implementation-independent" BOOTP protocol
diff --git a/libexec/bootpd/bootpd.8 b/libexec/bootpd/bootpd.8
index faef843..5630167 100644
--- a/libexec/bootpd/bootpd.8
+++ b/libexec/bootpd/bootpd.8
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1988, 1989, 1991 Carnegie Mellon University
 .\"
-.\"	$Id: bootpd.8,v 1.8 1998/02/03 07:30:22 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 06, 1993
 .Dt BOOTPD 8
diff --git a/libexec/bootpd/bootpd.c b/libexec/bootpd/bootpd.c
index ed0dee3..216e08f 100644
--- a/libexec/bootpd/bootpd.c
+++ b/libexec/bootpd/bootpd.c
@@ -19,7 +19,7 @@ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
 ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
-	$Id: bootpd.c,v 1.11 1999/04/07 08:27:39 brian Exp $
+ $FreeBSD$
 
 ************************************************************************/
 
diff --git a/libexec/bootpd/bootpgw/Makefile b/libexec/bootpd/bootpgw/Makefile
index 04f02eb..4a65853 100644
--- a/libexec/bootpd/bootpgw/Makefile
+++ b/libexec/bootpd/bootpgw/Makefile
@@ -1,5 +1,5 @@
 # Makefile
-# $Id$
+# $FreeBSD$
 
 PROG=	bootpgw
 NOMAN=  true
diff --git a/libexec/bootpd/bootptab.5 b/libexec/bootpd/bootptab.5
index 31174b6..eee489d 100644
--- a/libexec/bootpd/bootptab.5
+++ b/libexec/bootpd/bootptab.5
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1988, 1989, 1991 Carnegie Mellon University
 .\"
-.\"	$Id: bootptab.5,v 1.2 1998/02/03 07:30:22 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 31, 1991
 .Dt BOOTPTAB 5
diff --git a/libexec/bootpd/bootptab.mcs b/libexec/bootpd/bootptab.mcs
index a798f8a..9bce37e 100644
--- a/libexec/bootpd/bootptab.mcs
+++ b/libexec/bootpd/bootptab.mcs
@@ -2,7 +2,7 @@
 # Last update: gwr, Sun Dec 12 19:00:00 EDT 1993
 # Blank lines and lines beginning with '#' are ignored.
 #
-#	$Id$
+# $FreeBSD$
 #
 # Legend:	(see bootptab.5)
 #	first field -- hostname (not indented)
diff --git a/libexec/bootpd/dovend.c b/libexec/bootpd/dovend.c
index 447826f..9c8457b 100644
--- a/libexec/bootpd/dovend.c
+++ b/libexec/bootpd/dovend.c
@@ -1,7 +1,7 @@
 /*
  * dovend.c : Inserts all but the first few vendor options.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/dumptab.c b/libexec/bootpd/dumptab.c
index 4278ba1..5fa8320 100644
--- a/libexec/bootpd/dumptab.c
+++ b/libexec/bootpd/dumptab.c
@@ -1,7 +1,7 @@
 /*
  * dumptab.c - handles dumping the database
  *
- *	$Id: dumptab.c,v 1.4 1997/02/22 14:21:04 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/getether.c b/libexec/bootpd/getether.c
index 8f31bcb..8f95a59 100644
--- a/libexec/bootpd/getether.c
+++ b/libexec/bootpd/getether.c
@@ -7,7 +7,7 @@
  * If you figure out how to do this on another system,
  * please let me know.  <gwr@mc.com>
  *
- *	$Id: getether.c,v 1.7 1997/02/22 14:21:05 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/getif.c b/libexec/bootpd/getif.c
index ecfa610..ec7cd8f 100644
--- a/libexec/bootpd/getif.c
+++ b/libexec/bootpd/getif.c
@@ -1,7 +1,7 @@
 /*
  * getif.c : get an interface structure
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/hash.c b/libexec/bootpd/hash.c
index f959751..16b0420 100644
--- a/libexec/bootpd/hash.c
+++ b/libexec/bootpd/hash.c
@@ -19,7 +19,7 @@ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
 ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
-	$Id$
+ $FreeBSD$
 
 ************************************************************************/
 
diff --git a/libexec/bootpd/hwaddr.c b/libexec/bootpd/hwaddr.c
index b4fe5e4..9a9de1a 100644
--- a/libexec/bootpd/hwaddr.c
+++ b/libexec/bootpd/hwaddr.c
@@ -2,7 +2,7 @@
  * hwaddr.c - routines that deal with hardware addresses.
  * (i.e. Ethernet)
  *
- *	$Id: hwaddr.c,v 1.5 1997/02/22 14:21:07 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/hwaddr.h b/libexec/bootpd/hwaddr.h
index b0a8c29..2004273 100644
--- a/libexec/bootpd/hwaddr.h
+++ b/libexec/bootpd/hwaddr.h
@@ -1,7 +1,7 @@
 /* 
  * hwaddr.h
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef	HWADDR_H
diff --git a/libexec/bootpd/lookup.c b/libexec/bootpd/lookup.c
index af3b37a..54b3f62 100644
--- a/libexec/bootpd/lookup.c
+++ b/libexec/bootpd/lookup.c
@@ -1,7 +1,7 @@
 /*
  * lookup.c - Lookup IP address, HW address, netmask
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/patchlevel.h b/libexec/bootpd/patchlevel.h
index 85566b5..fc79f18 100644
--- a/libexec/bootpd/patchlevel.h
+++ b/libexec/bootpd/patchlevel.h
@@ -1,7 +1,7 @@
 /* 
  * patchlevel.h 
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #define VERSION 	"2.4"
diff --git a/libexec/bootpd/readfile.c b/libexec/bootpd/readfile.c
index 8d895fd..58c65b5 100644
--- a/libexec/bootpd/readfile.c
+++ b/libexec/bootpd/readfile.c
@@ -19,7 +19,7 @@ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
 ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
-	$Id: readfile.c,v 1.4 1997/02/22 14:21:09 peter Exp $
+ $FreeBSD$
 
 ************************************************************************/
 
diff --git a/libexec/bootpd/rtmsg.c b/libexec/bootpd/rtmsg.c
index e9702bb..40b8728 100644
--- a/libexec/bootpd/rtmsg.c
+++ b/libexec/bootpd/rtmsg.c
@@ -39,7 +39,7 @@
 
 /*
  * from arp.c	8.2 (Berkeley) 1/2/94
- * $Id: rtmsg.c,v 1.8 1997/02/22 14:21:09 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/libexec/bootpd/tools/Makefile b/libexec/bootpd/tools/Makefile
index b1f38e7..e905bff 100644
--- a/libexec/bootpd/tools/Makefile
+++ b/libexec/bootpd/tools/Makefile
@@ -1,5 +1,5 @@
 # Makefile
-# $Id$
+# $FreeBSD$
 
 SUBDIR=	bootpef bootptest
 
diff --git a/libexec/bootpd/tools/Makefile.inc b/libexec/bootpd/tools/Makefile.inc
index 0a2ab66..16007ee 100644
--- a/libexec/bootpd/tools/Makefile.inc
+++ b/libexec/bootpd/tools/Makefile.inc
@@ -1,4 +1,4 @@
 # Makefile.inc
-# $Id$
+# $FreeBSD$
 
 BINDIR=/usr/sbin
diff --git a/libexec/bootpd/tools/bootpef/Makefile b/libexec/bootpd/tools/bootpef/Makefile
index 7d17606..dfb7662 100644
--- a/libexec/bootpd/tools/bootpef/Makefile
+++ b/libexec/bootpd/tools/bootpef/Makefile
@@ -1,5 +1,5 @@
 # Makefile
-# $Id$
+# $FreeBSD$
 
 PROG=	bootpef
 MAN8=	bootpef.8
diff --git a/libexec/bootpd/tools/bootpef/bootpef.c b/libexec/bootpd/tools/bootpef/bootpef.c
index c459ac8..893efd87 100644
--- a/libexec/bootpd/tools/bootpef/bootpef.c
+++ b/libexec/bootpd/tools/bootpef/bootpef.c
@@ -19,7 +19,7 @@ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
 ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
-	$Id: bootpef.c,v 1.4 1997/02/22 14:21:18 peter Exp $
+ $FreeBSD$
 
 ************************************************************************/
 
diff --git a/libexec/bootpd/tools/bootptest/Makefile b/libexec/bootpd/tools/bootptest/Makefile
index 148a556..1bc8887 100644
--- a/libexec/bootpd/tools/bootptest/Makefile
+++ b/libexec/bootpd/tools/bootptest/Makefile
@@ -1,5 +1,5 @@
 # Makefile
-# $Id$
+# $FreeBSD$
 
 PROG=	bootptest
 MAN8=	bootptest.8
diff --git a/libexec/bootpd/tools/bootptest/bootptest.c b/libexec/bootpd/tools/bootptest/bootptest.c
index d319426..f56a095 100644
--- a/libexec/bootpd/tools/bootptest/bootptest.c
+++ b/libexec/bootpd/tools/bootptest/bootptest.c
@@ -31,7 +31,7 @@
  * 09/28/93 Released version 1.0
  * 09/93 Original developed by Gordon W. Ross <gwr@mc.com>
  *
- *	$Id: bootptest.c,v 1.5 1997/12/24 18:56:03 imp Exp $
+ * $FreeBSD$
  */
 
 char *usage = "bootptest [-h] server-name [vendor-data-template-file]";
diff --git a/libexec/bootpd/tools/bootptest/print-bootp.c b/libexec/bootpd/tools/bootptest/print-bootp.c
index c8e1c2e..977a32d 100644
--- a/libexec/bootpd/tools/bootptest/print-bootp.c
+++ b/libexec/bootpd/tools/bootptest/print-bootp.c
@@ -23,7 +23,7 @@
  * This file was copied from tcpdump-2.1.1 and modified.
  * There is an e-mail list for tcpdump: <tcpdump@ee.lbl.gov>
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/libexec/bootpd/trygetea.c b/libexec/bootpd/trygetea.c
index 41800d7..0ae63a3 100644
--- a/libexec/bootpd/trygetea.c
+++ b/libexec/bootpd/trygetea.c
@@ -1,7 +1,7 @@
 /*
  * trygetea.c - test program for getether.c
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/trygetif.c b/libexec/bootpd/trygetif.c
index e6226dc..0e2cca1 100644
--- a/libexec/bootpd/trygetif.c
+++ b/libexec/bootpd/trygetif.c
@@ -1,7 +1,7 @@
 /*
  * trygetif.c - test program for getif.c
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/trylook.c b/libexec/bootpd/trylook.c
index 0681dce..9484d04 100644
--- a/libexec/bootpd/trylook.c
+++ b/libexec/bootpd/trylook.c
@@ -1,7 +1,7 @@
 /*
  * trylook.c - test program for lookup.c
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/libexec/comsat/Makefile b/libexec/comsat/Makefile
index 7352ab5..d3a6740 100644
--- a/libexec/comsat/Makefile
+++ b/libexec/comsat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	comsat
 MAN8=	comsat.8
diff --git a/libexec/comsat/comsat.8 b/libexec/comsat/comsat.8
index 916d1c9..eb0d7d3 100644
--- a/libexec/comsat/comsat.8
+++ b/libexec/comsat/comsat.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)comsat.8	8.1 (Berkeley) 6/4/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt COMSAT 8
diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c
index a199f58..ab920a2 100644
--- a/libexec/comsat/comsat.c
+++ b/libexec/comsat/comsat.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)comsat.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id: comsat.c,v 1.11 1997/11/20 07:23:44 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/fingerd/Makefile b/libexec/fingerd/Makefile
index 793cfc3..6c78d8d 100644
--- a/libexec/fingerd/Makefile
+++ b/libexec/fingerd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile,v 1.5 1997/02/22 14:21:24 peter Exp $
+# $FreeBSD$
 
 PROG=	fingerd
 DPADD=	${LIBUTIL}
diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c
index e65f283..aa71613 100644
--- a/libexec/fingerd/fingerd.c
+++ b/libexec/fingerd/fingerd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)fingerd.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id: fingerd.c,v 1.13 1999/04/07 06:00:22 brian Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index f25478b..e239286 100644
--- a/libexec/ftpd/Makefile
+++ b/libexec/ftpd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/4/94
-#	$Id: Makefile,v 1.25 1998/11/21 02:11:16 jdp Exp $
+# $FreeBSD$
 
 PROG=	ftpd
 MAN8=	ftpd.8
diff --git a/libexec/ftpd/extern.h b/libexec/ftpd/extern.h
index e27dae4..9888cb6 100644
--- a/libexec/ftpd/extern.h
+++ b/libexec/ftpd/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/4/94
- *	$Id: extern.h,v 1.11 1997/09/05 11:43:56 tg Exp $
+ * $FreeBSD$
  */
 
 void	blkfree __P((char **));
diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y
index 51a6f44..359fa81 100644
--- a/libexec/ftpd/ftpcmd.y
+++ b/libexec/ftpd/ftpcmd.y
@@ -45,7 +45,7 @@
 static char sccsid[] = "@(#)ftpcmd.y	8.3 (Berkeley) 4/6/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8
index fab3108..8f2cca7 100644
--- a/libexec/ftpd/ftpd.8
+++ b/libexec/ftpd/ftpd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ftpd.8	8.2 (Berkeley) 4/19/94
-.\"	$Id: ftpd.8,v 1.27 1999/06/28 10:50:47 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt FTPD 8
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 0150283..7ce5abb 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -44,7 +44,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)ftpd.c	8.4 (Berkeley) 4/16/94";
 #endif
 static const char rcsid[] =
-	"$Id: ftpd.c,v 1.55 1999/04/25 22:23:35 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/ftpd/logwtmp.c b/libexec/ftpd/logwtmp.c
index 5c9cd3f..d3f2ec5 100644
--- a/libexec/ftpd/logwtmp.c
+++ b/libexec/ftpd/logwtmp.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)logwtmp.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/libexec/ftpd/pathnames.h b/libexec/ftpd/pathnames.h
index d2f8b73..a8837a9 100644
--- a/libexec/ftpd/pathnames.h
+++ b/libexec/ftpd/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/4/93
- *	$Id: pathnames.h,v 1.9 1997/04/26 12:12:10 davidn Exp $
+ * $FreeBSD$
  */
 
 #include <paths.h>
diff --git a/libexec/ftpd/popen.c b/libexec/ftpd/popen.c
index 6b21215..606d17a 100644
--- a/libexec/ftpd/popen.c
+++ b/libexec/ftpd/popen.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)popen.c	8.3 (Berkeley) 4/6/94";
 #endif
 static const char rcsid[] =
-	"$Id: popen.c,v 1.15 1998/05/18 00:06:28 ache Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/libexec/ftpd/skey-stuff.c b/libexec/ftpd/skey-stuff.c
index 30faa9e..f06a415 100644
--- a/libexec/ftpd/skey-stuff.c
+++ b/libexec/ftpd/skey-stuff.c
@@ -3,7 +3,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: skey-stuff.c,v 1.10 1997/11/21 07:38:43 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/libexec/getNAME/Makefile b/libexec/getNAME/Makefile
index 6600d23..a88492c 100644
--- a/libexec/getNAME/Makefile
+++ b/libexec/getNAME/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $Id$
+# $FreeBSD$
 
 PROG=	getNAME
 
diff --git a/libexec/getNAME/getNAME.1 b/libexec/getNAME/getNAME.1
index d292ab6..27e85bd 100644
--- a/libexec/getNAME/getNAME.1
+++ b/libexec/getNAME/getNAME.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: getNAME.1,v 1.6 1997/02/22 14:21:34 peter Exp $
+.\" $FreeBSD$
 
 .Dd July 8, 1996
 .Dt getNAME 1
diff --git a/libexec/getNAME/getNAME.c b/libexec/getNAME/getNAME.c
index 87da702..3fd63bd 100644
--- a/libexec/getNAME/getNAME.c
+++ b/libexec/getNAME/getNAME.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)getNAME.c	8.1 (Berkeley) 6/30/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/getty/Makefile b/libexec/getty/Makefile
index f51fe24..595ae44 100644
--- a/libexec/getty/Makefile
+++ b/libexec/getty/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	getty
 SRCS=	main.c init.c subr.c chat.c
diff --git a/libexec/getty/chat.c b/libexec/getty/chat.c
index af509f0..1fdef26 100644
--- a/libexec/getty/chat.c
+++ b/libexec/getty/chat.c
@@ -25,7 +25,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/getty/extern.h b/libexec/getty/extern.h
index bd84a13..94fe3cc 100644
--- a/libexec/getty/extern.h
+++ b/libexec/getty/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)extern.h	8.1 (Berkeley) 6/4/93
- *	$Id$
+ * $FreeBSD$
  */
 
 struct delayval;
diff --git a/libexec/getty/getty.8 b/libexec/getty/getty.8
index 5492a91..bd81c04 100644
--- a/libexec/getty/getty.8
+++ b/libexec/getty/getty.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)getty.8	8.1 (Berkeley) 6/4/93
-.\"	$Id: getty.8,v 1.8 1997/08/17 16:36:41 steve Exp $
+.\" $FreeBSD$
 .\" "
 .Dd June 4, 1993
 .Dt GETTY 8
diff --git a/libexec/getty/gettytab.5 b/libexec/getty/gettytab.5
index 1a09d43..6a80b67 100644
--- a/libexec/getty/gettytab.5
+++ b/libexec/getty/gettytab.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)gettytab.5	8.4 (Berkeley) 4/19/94
-.\"	$Id: gettytab.5,v 1.18 1998/06/10 12:34:25 phk Exp $
+.\" $FreeBSD$
 .\" "
 .Dd April 19, 1994
 .Dt GETTYTAB 5
diff --git a/libexec/getty/gettytab.h b/libexec/getty/gettytab.h
index 1323f67..b0a65e8 100644
--- a/libexec/getty/gettytab.h
+++ b/libexec/getty/gettytab.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)gettytab.h	8.2 (Berkeley) 3/30/94
- *	$Id: gettytab.h,v 1.8 1997/02/22 14:21:38 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/libexec/getty/init.c b/libexec/getty/init.c
index 3f279fa..d06378b 100644
--- a/libexec/getty/init.c
+++ b/libexec/getty/init.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)from: init.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id: init.c,v 1.9 1997/11/21 07:43:49 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/getty/main.c b/libexec/getty/main.c
index cf1bf29..0eac55b 100644
--- a/libexec/getty/main.c
+++ b/libexec/getty/main.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)from: main.c	8.1 (Berkeley) 6/20/93";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.25 1999/04/04 04:36:50 peter Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/getty/pathnames.h b/libexec/getty/pathnames.h
index fd397dd..035e8b6 100644
--- a/libexec/getty/pathnames.h
+++ b/libexec/getty/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pathnames.h	8.1 (Berkeley) 6/4/93
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <paths.h>
diff --git a/libexec/getty/subr.c b/libexec/getty/subr.c
index c5246b7..13c7bd0 100644
--- a/libexec/getty/subr.c
+++ b/libexec/getty/subr.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)from: subr.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id: subr.c,v 1.13 1997/11/21 07:43:52 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/getty/ttys.5 b/libexec/getty/ttys.5
index 1123370..502decb 100644
--- a/libexec/getty/ttys.5
+++ b/libexec/getty/ttys.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)ttys.5	8.1 (Berkeley) 6/4/93
-.\"	$Id: ttys.5,v 1.8 1997/06/02 21:03:20 davidn Exp $
+.\" $FreeBSD$
 .\" "
 .Dd November 17, 1996
 .Dt TTYS 5
diff --git a/libexec/mail.local/Makefile b/libexec/mail.local/Makefile
index 02f33fc..1e90280 100644
--- a/libexec/mail.local/Makefile
+++ b/libexec/mail.local/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-#	$Id: Makefile,v 1.8 1998/08/04 15:30:17 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../contrib/sendmail/mail.local \
 	${.CURDIR}/../../contrib/sendmail/src
diff --git a/libexec/makekey/Makefile b/libexec/makekey/Makefile
index 2ec0edd..2028c6d 100644
--- a/libexec/makekey/Makefile
+++ b/libexec/makekey/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	makekey
 MAN8=	makekey.8
diff --git a/libexec/makekey/makekey.8 b/libexec/makekey/makekey.8
index 73f444f..9a85c22 100644
--- a/libexec/makekey/makekey.8
+++ b/libexec/makekey/makekey.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)makekey.8	8.2 (Berkeley) 12/11/93
-.\"	$Id: makekey.8,v 1.7 1997/02/22 14:21:50 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt MAKEKEY 8
diff --git a/libexec/makekey/makekey.c b/libexec/makekey/makekey.c
index c04abc4..5f9dc04 100644
--- a/libexec/makekey/makekey.c
+++ b/libexec/makekey/makekey.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)makekey.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/libexec/mknetid/Makefile b/libexec/mknetid/Makefile
index db5999b..3f55920 100644
--- a/libexec/mknetid/Makefile
+++ b/libexec/mknetid/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	mknetid
 SRCS=	mknetid.c hash.c parse_group.c
diff --git a/libexec/mknetid/hash.c b/libexec/mknetid/hash.c
index 989fdb3..8de336f 100644
--- a/libexec/mknetid/hash.c
+++ b/libexec/mknetid/hash.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/mknetid/hash.h b/libexec/mknetid/hash.h
index 5f6cd2e..04bc784 100644
--- a/libexec/mknetid/hash.h
+++ b/libexec/mknetid/hash.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /* Groupid entry hung off a member_entry node. */
diff --git a/libexec/mknetid/mknetid.8 b/libexec/mknetid/mknetid.8
index 9ef61fd..a3e3d99 100644
--- a/libexec/mknetid/mknetid.8
+++ b/libexec/mknetid/mknetid.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: mknetid.8,v 1.5 1998/03/19 07:37:10 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 23, 1996
 .Dt MKNETID 8
diff --git a/libexec/mknetid/mknetid.c b/libexec/mknetid/mknetid.c
index 4b8a328..2341451 100644
--- a/libexec/mknetid/mknetid.c
+++ b/libexec/mknetid/mknetid.c
@@ -55,7 +55,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: mknetid.c,v 1.9 1997/12/15 07:19:41 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #define LINSIZ 1024
diff --git a/libexec/mknetid/parse_group.c b/libexec/mknetid/parse_group.c
index 5d2917d..3278474 100644
--- a/libexec/mknetid/parse_group.c
+++ b/libexec/mknetid/parse_group.c
@@ -36,7 +36,7 @@
 static const char sccsid[] = "@(#)getgrent.c	8.2 (Berkeley) 3/21/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/named-xfer/Makefile b/libexec/named-xfer/Makefile
index 0e3c307..62ed91a 100644
--- a/libexec/named-xfer/Makefile
+++ b/libexec/named-xfer/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.7 1998/05/04 05:12:49 peter Exp $
+# $FreeBSD$
 
 USE_LIBBIND=	true
 .include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
diff --git a/libexec/rbootd/Makefile b/libexec/rbootd/Makefile
index 0cc5ac2..f4ad590 100644
--- a/libexec/rbootd/Makefile
+++ b/libexec/rbootd/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile,v 1.7 1997/02/22 14:21:57 peter Exp $
+# $FreeBSD$
 
 PROG=	rbootd
 SRCS=	bpf.c conf.c parseconf.c rbootd.c rmpproto.c utils.c
diff --git a/libexec/rbootd/bpf.c b/libexec/rbootd/bpf.c
index 758e421..98d6e00 100644
--- a/libexec/rbootd/bpf.c
+++ b/libexec/rbootd/bpf.c
@@ -49,7 +49,7 @@
 static const char sccsid[] = "@(#)bpf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rbootd/conf.c b/libexec/rbootd/conf.c
index e2d9643..74ff341 100644
--- a/libexec/rbootd/conf.c
+++ b/libexec/rbootd/conf.c
@@ -49,7 +49,7 @@
 static const char sccsid[] = "@(#)conf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id: conf.c,v 1.3 1997/11/24 07:33:40 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rbootd/parseconf.c b/libexec/rbootd/parseconf.c
index 1260c29..21e4c0b 100644
--- a/libexec/rbootd/parseconf.c
+++ b/libexec/rbootd/parseconf.c
@@ -49,7 +49,7 @@
 static const char sccsid[] = "@(#)parseconf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rbootd/rbootd.8 b/libexec/rbootd/rbootd.8
index df5adcc..c18558d 100644
--- a/libexec/rbootd/rbootd.8
+++ b/libexec/rbootd/rbootd.8
@@ -38,7 +38,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)rbootd.8	8.2 (Berkeley) 12/11/93
-.\"	$Id: rbootd.8,v 1.7 1997/06/29 19:00:13 steve Exp $
+.\" $FreeBSD$
 .\"
 .\" Utah Hdr: rbootd.man 3.1 92/07/06
 .\" Author: Jeff Forys, University of Utah CSS
diff --git a/libexec/rbootd/rbootd.c b/libexec/rbootd/rbootd.c
index b8e384d..2f7c384 100644
--- a/libexec/rbootd/rbootd.c
+++ b/libexec/rbootd/rbootd.c
@@ -55,7 +55,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)rbootd.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id: rbootd.c,v 1.9 1997/11/24 07:33:41 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rbootd/rmpproto.c b/libexec/rbootd/rmpproto.c
index 989ba86..80ce805 100644
--- a/libexec/rbootd/rmpproto.c
+++ b/libexec/rbootd/rmpproto.c
@@ -49,7 +49,7 @@
 static const char sccsid[] = "@(#)rmpproto.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id: rmpproto.c,v 1.4 1997/11/24 07:33:41 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rbootd/utils.c b/libexec/rbootd/utils.c
index 9dbcf20..9364513 100644
--- a/libexec/rbootd/utils.c
+++ b/libexec/rbootd/utils.c
@@ -49,7 +49,7 @@
 static const char sccsid[] = "@(#)utils.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/revnetgroup/Makefile b/libexec/revnetgroup/Makefile
index dec0e7b..9c41089 100644
--- a/libexec/revnetgroup/Makefile
+++ b/libexec/revnetgroup/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	revnetgroup
 SRCS=	revnetgroup.c hash.c parse_netgroup.c
diff --git a/libexec/revnetgroup/hash.c b/libexec/revnetgroup/hash.c
index 093b44a..c11244a 100644
--- a/libexec/revnetgroup/hash.c
+++ b/libexec/revnetgroup/hash.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/libexec/revnetgroup/hash.h b/libexec/revnetgroup/hash.h
index 7106967..04a44d6 100644
--- a/libexec/revnetgroup/hash.h
+++ b/libexec/revnetgroup/hash.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /* Groupname entry hung off a member_entry node. */
diff --git a/libexec/revnetgroup/parse_netgroup.c b/libexec/revnetgroup/parse_netgroup.c
index 19a9010..6b795c6 100644
--- a/libexec/revnetgroup/parse_netgroup.c
+++ b/libexec/revnetgroup/parse_netgroup.c
@@ -36,7 +36,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/revnetgroup/revnetgroup.8 b/libexec/revnetgroup/revnetgroup.8
index 5944f4b..62953e2 100644
--- a/libexec/revnetgroup/revnetgroup.8
+++ b/libexec/revnetgroup/revnetgroup.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: revnetgroup.8,v 1.5 1997/11/25 07:14:34 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 24, 1995
 .Dt REVNETGROUP 8
diff --git a/libexec/revnetgroup/revnetgroup.c b/libexec/revnetgroup/revnetgroup.c
index 3599acd..eccdada 100644
--- a/libexec/revnetgroup/revnetgroup.c
+++ b/libexec/revnetgroup/revnetgroup.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/libexec/rexecd/Makefile b/libexec/rexecd/Makefile
index 9dd048d..fa5203c 100644
--- a/libexec/rexecd/Makefile
+++ b/libexec/rexecd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile,v 1.8 1997/02/22 14:22:05 peter Exp $
+# $FreeBSD$
 
 PROG=	rexecd
 MAN8=	rexecd.8
diff --git a/libexec/rexecd/rexecd.8 b/libexec/rexecd/rexecd.8
index eacc08a..4c86268 100644
--- a/libexec/rexecd/rexecd.8
+++ b/libexec/rexecd/rexecd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rexecd.8	8.2 (Berkeley) 12/11/93
-.\"	$Id: rexecd.8,v 1.7 1997/02/22 14:22:05 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 23, 1994
 .Dt REXECD 8
diff --git a/libexec/rexecd/rexecd.c b/libexec/rexecd/rexecd.c
index 8c8c06b..10c2f2b 100644
--- a/libexec/rexecd/rexecd.c
+++ b/libexec/rexecd/rexecd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)rexecd.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id: rexecd.c,v 1.16 1999/04/06 23:05:57 brian Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rlogind/Makefile b/libexec/rlogind/Makefile
index 2685f84..a5deb98 100644
--- a/libexec/rlogind/Makefile
+++ b/libexec/rlogind/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile,v 1.9 1998/08/06 21:35:47 markm Exp $
+# $FreeBSD$
 
 PROG=	rlogind
 SRCS=	rlogind.c
diff --git a/libexec/rlogind/rlogind.8 b/libexec/rlogind/rlogind.8
index 4f8ae93..7eebc2b 100644
--- a/libexec/rlogind/rlogind.8
+++ b/libexec/rlogind/rlogind.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rlogind.8	8.1 (Berkeley) 6/4/93
-.\"	$Id: rlogind.8,v 1.9 1997/11/25 07:17:13 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt RLOGIND 8
diff --git a/libexec/rlogind/rlogind.c b/libexec/rlogind/rlogind.c
index 70febc0b..a99ac7e 100644
--- a/libexec/rlogind/rlogind.c
+++ b/libexec/rlogind/rlogind.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)rlogind.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id: rlogind.c,v 1.24 1999/08/21 18:15:55 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/rpc.rquotad/Makefile b/libexec/rpc.rquotad/Makefile
index 53ca412..1bda56a 100644
--- a/libexec/rpc.rquotad/Makefile
+++ b/libexec/rpc.rquotad/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG =	rpc.rquotad
 SRCS =	rquotad.c
diff --git a/libexec/rpc.rquotad/rpc.rquotad.8 b/libexec/rpc.rquotad/rpc.rquotad.8
index 4a2aa30..a4fa2c0 100644
--- a/libexec/rpc.rquotad/rpc.rquotad.8
+++ b/libexec/rpc.rquotad/rpc.rquotad.8
@@ -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: rpc.rquotad.8,v 1.4 1997/03/14 06:09:04 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 22, 1994
 .Dt RPC.RQUOTAD 8
diff --git a/libexec/rpc.rquotad/rquotad.c b/libexec/rpc.rquotad/rquotad.c
index 926d300..aba357a 100644
--- a/libexec/rpc.rquotad/rquotad.c
+++ b/libexec/rpc.rquotad/rquotad.c
@@ -6,7 +6,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/rpc.rstatd/Makefile b/libexec/rpc.rstatd/Makefile
index efef47a..d4b71ea 100644
--- a/libexec/rpc.rstatd/Makefile
+++ b/libexec/rpc.rstatd/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1997/02/22 14:22:11 peter Exp $
+# $FreeBSD$
 
 PROG =	rpc.rstatd
 SRCS =	rstatd.c rstat_proc.c
diff --git a/libexec/rpc.rstatd/rpc.rstatd.8 b/libexec/rpc.rstatd/rpc.rstatd.8
index 8897232..8860e55 100644
--- a/libexec/rpc.rstatd/rpc.rstatd.8
+++ b/libexec/rpc.rstatd/rpc.rstatd.8
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: rpc.rstatd.8,v 1.3 1997/02/22 14:22:12 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 7, 1993
 .Dt RPC.RSTATD 8
diff --git a/libexec/rpc.rstatd/rstat_proc.c b/libexec/rpc.rstatd/rstat_proc.c
index 16e060c..7f6bd55 100644
--- a/libexec/rpc.rstatd/rstat_proc.c
+++ b/libexec/rpc.rstatd/rstat_proc.c
@@ -33,7 +33,7 @@ static char sccsid[] = "from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro
 static char sccsid[] = "from: @(#)rstat_proc.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
 static const char rcsid[] =
-	"$Id: rstat_proc.c,v 1.12 1998/09/16 21:33:14 dfr Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/libexec/rpc.rstatd/rstatd.c b/libexec/rpc.rstatd/rstatd.c
index ede8d50..21a0d56 100644
--- a/libexec/rpc.rstatd/rstatd.c
+++ b/libexec/rpc.rstatd/rstatd.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: rstatd.c,v 1.6 1997/11/26 07:34:56 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/libexec/rpc.rusersd/Makefile b/libexec/rpc.rusersd/Makefile
index 48f3853..fefc7bf 100644
--- a/libexec/rpc.rusersd/Makefile
+++ b/libexec/rpc.rusersd/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG =	rpc.rusersd
 SRCS =	rusersd.c rusers_proc.c
diff --git a/libexec/rpc.rusersd/rpc.rusersd.8 b/libexec/rpc.rusersd/rpc.rusersd.8
index c303eef..1775cdd 100644
--- a/libexec/rpc.rusersd/rpc.rusersd.8
+++ b/libexec/rpc.rusersd/rpc.rusersd.8
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: rpc.rusersd.8,v 1.4 1997/02/22 14:22:16 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 7, 1993
 .Dt RPC.RUSERSD 8
diff --git a/libexec/rpc.rusersd/rusers_proc.c b/libexec/rpc.rusersd/rusers_proc.c
index e61e52c..4042217 100644
--- a/libexec/rpc.rusersd/rusers_proc.c
+++ b/libexec/rpc.rusersd/rusers_proc.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: rusers_proc.c,v 1.8 1998/01/07 07:54:17 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #ifdef DEBUG
diff --git a/libexec/rpc.rusersd/rusersd.c b/libexec/rpc.rusersd/rusersd.c
index 5d96f9e..9482692 100644
--- a/libexec/rpc.rusersd/rusersd.c
+++ b/libexec/rpc.rusersd/rusersd.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: rusersd.c,v 1.6 1997/11/26 07:36:51 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/libexec/rpc.rwalld/Makefile b/libexec/rpc.rwalld/Makefile
index f9bf277..8a0b75c 100644
--- a/libexec/rpc.rwalld/Makefile
+++ b/libexec/rpc.rwalld/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG =	rpc.rwalld
 SRCS =	rwalld.c
diff --git a/libexec/rpc.rwalld/rpc.rwalld.8 b/libexec/rpc.rwalld/rpc.rwalld.8
index 31204f5..116142e 100644
--- a/libexec/rpc.rwalld/rpc.rwalld.8
+++ b/libexec/rpc.rwalld/rpc.rwalld.8
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: rpc.rwalld.8,v 1.3 1997/02/22 14:22:18 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 7, 1993
 .Dt RPC.RWALLD 8
diff --git a/libexec/rpc.rwalld/rwalld.c b/libexec/rpc.rwalld/rwalld.c
index f94f4a6..985dca9 100644
--- a/libexec/rpc.rwalld/rwalld.c
+++ b/libexec/rpc.rwalld/rwalld.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: rwalld.c,v 1.6 1997/12/02 12:20:17 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/libexec/rpc.sprayd/Makefile b/libexec/rpc.sprayd/Makefile
index 233c4d8..80d7330 100644
--- a/libexec/rpc.sprayd/Makefile
+++ b/libexec/rpc.sprayd/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG =	rpc.sprayd
 SRCS =	sprayd.c
diff --git a/libexec/rpc.sprayd/rpc.sprayd.8 b/libexec/rpc.sprayd/rpc.sprayd.8
index 5979b44..ebf8382 100644
--- a/libexec/rpc.sprayd/rpc.sprayd.8
+++ b/libexec/rpc.sprayd/rpc.sprayd.8
@@ -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: rpc.sprayd.8,v 1.4 1997/02/22 14:22:20 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 22, 1994
 .Dt RPC.SPRAYD 8
diff --git a/libexec/rpc.sprayd/sprayd.c b/libexec/rpc.sprayd/sprayd.c
index b6e5fd1..a6324e8 100644
--- a/libexec/rpc.sprayd/sprayd.c
+++ b/libexec/rpc.sprayd/sprayd.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <rpc/rpc.h>
diff --git a/libexec/rshd/Makefile b/libexec/rshd/Makefile
index d9bfb79..fece4b8 100644
--- a/libexec/rshd/Makefile
+++ b/libexec/rshd/Makefile
@@ -1,5 +1,5 @@
 # From:	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $Id: Makefile,v 1.9 1998/08/06 21:36:25 markm Exp $
+# $FreeBSD$
 
 PROG=	rshd
 SRCS=	rshd.c
diff --git a/libexec/rshd/rshd.8 b/libexec/rshd/rshd.8
index 7af12ec..e349ea0 100644
--- a/libexec/rshd/rshd.8
+++ b/libexec/rshd/rshd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rshd.8	8.1 (Berkeley) 6/4/93
-.\"	$Id: rshd.8,v 1.14 1998/12/16 07:20:44 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 4, 1993
 .Dt RSHD 8
diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c
index 24b7d35..c2afeb5 100644
--- a/libexec/rshd/rshd.c
+++ b/libexec/rshd/rshd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)rshd.c	8.2 (Berkeley) 4/6/94";
 #endif
 static const char rcsid[] =
-	"$Id: rshd.c,v 1.24 1999/04/06 23:05:58 brian Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/rtld-aout/Makefile b/libexec/rtld-aout/Makefile
index 160f414..d2c99ec 100644
--- a/libexec/rtld-aout/Makefile
+++ b/libexec/rtld-aout/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.26 1998/06/01 13:00:32 peter Exp $
+# $FreeBSD$
 PROG=	ld.so
 SRCS=	mdprologue.S rtld.c shlib.c md.c support.c
 MAN1=	rtld.1
diff --git a/libexec/rtld-aout/dynamic.h b/libexec/rtld-aout/dynamic.h
index c1890db..00d449f 100644
--- a/libexec/rtld-aout/dynamic.h
+++ b/libexec/rtld-aout/dynamic.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: dynamic.h,v 1.3 1997/02/22 15:46:18 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef __DYNAMIC_H__
diff --git a/libexec/rtld-aout/i386/md-static-funcs.c b/libexec/rtld-aout/i386/md-static-funcs.c
index 758a4b2..77c25c5 100644
--- a/libexec/rtld-aout/i386/md-static-funcs.c
+++ b/libexec/rtld-aout/i386/md-static-funcs.c
@@ -1,5 +1,5 @@
 /*
- *	$Id$
+ * $FreeBSD$
  *
  * Called by ld.so when onanating.
  * This *must* be a static function, so it is not called through a jmpslot.
diff --git a/libexec/rtld-aout/i386/md.c b/libexec/rtld-aout/i386/md.c
index 8e945e8..63b9d17 100644
--- a/libexec/rtld-aout/i386/md.c
+++ b/libexec/rtld-aout/i386/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/libexec/rtld-aout/i386/md.h b/libexec/rtld-aout/i386/md.h
index 84785de..ef5b632 100644
--- a/libexec/rtld-aout/i386/md.h
+++ b/libexec/rtld-aout/i386/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: md.h,v 1.16 1997/02/22 15:46:34 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef __MD_H__
diff --git a/libexec/rtld-aout/i386/mdprologue.S b/libexec/rtld-aout/i386/mdprologue.S
index 091fe7f..f111bca 100644
--- a/libexec/rtld-aout/i386/mdprologue.S
+++ b/libexec/rtld-aout/i386/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/libexec/rtld-aout/rtld.1 b/libexec/rtld-aout/rtld.1
index 90e9d54..52a1b32 100644
--- a/libexec/rtld-aout/rtld.1
+++ b/libexec/rtld-aout/rtld.1
@@ -1,4 +1,4 @@
-.\"	$Id: rtld.1,v 1.14 1997/05/27 13:46:40 max Exp $
+.\" $FreeBSD$
 .\"
 .\" Copyright (c) 1995 Paul Kranenburg
 .\" All rights reserved.
diff --git a/libexec/rtld-aout/rtld.1aout b/libexec/rtld-aout/rtld.1aout
index 90e9d54..52a1b32 100644
--- a/libexec/rtld-aout/rtld.1aout
+++ b/libexec/rtld-aout/rtld.1aout
@@ -1,4 +1,4 @@
-.\"	$Id: rtld.1,v 1.14 1997/05/27 13:46:40 max Exp $
+.\" $FreeBSD$
 .\"
 .\" Copyright (c) 1995 Paul Kranenburg
 .\" All rights reserved.
diff --git a/libexec/rtld-aout/rtld.c b/libexec/rtld-aout/rtld.c
index eff59b6..a55e9bc 100644
--- a/libexec/rtld-aout/rtld.c
+++ b/libexec/rtld-aout/rtld.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: rtld.c,v 1.56 1998/08/22 15:51:41 mckay Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/libexec/rtld-aout/shlib.c b/libexec/rtld-aout/shlib.c
index 5bd968f..989cf45 100644
--- a/libexec/rtld-aout/shlib.c
+++ b/libexec/rtld-aout/shlib.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: shlib.c,v 1.20 1998/06/07 03:53:08 brian Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/libexec/rtld-aout/shlib.h b/libexec/rtld-aout/shlib.h
index e7d2211..d05690f 100644
--- a/libexec/rtld-aout/shlib.h
+++ b/libexec/rtld-aout/shlib.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *-
- * $Id: shlib.h,v 1.3 1997/02/22 15:46:24 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/libexec/rtld-aout/support.c b/libexec/rtld-aout/support.c
index 0d9df2a..71a84ff 100644
--- a/libexec/rtld-aout/support.c
+++ b/libexec/rtld-aout/support.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *-
- * $Id$
+ * $FreeBSD$
  */
 #include <sys/types.h>
 #include <string.h>
diff --git a/libexec/rtld-aout/support.h b/libexec/rtld-aout/support.h
index 5be1e31..da03407 100644
--- a/libexec/rtld-aout/support.h
+++ b/libexec/rtld-aout/support.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *-
- * $Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index 47598e6..4b02d4b 100644
--- a/libexec/rtld-elf/Makefile
+++ b/libexec/rtld-elf/Makefile
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile,v 1.6 1999/04/09 00:28:31 jdp Exp $
+# $FreeBSD$
 #
 MAINTAINER=	jdp
 PROG=		ld-elf.so.1
diff --git a/libexec/rtld-elf/alpha/reloc.c b/libexec/rtld-elf/alpha/reloc.c
index f77e952..03d8c17 100644
--- a/libexec/rtld-elf/alpha/reloc.c
+++ b/libexec/rtld-elf/alpha/reloc.c
@@ -22,7 +22,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: reloc.c,v 1.5 1999/06/25 02:53:55 jdp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/libexec/rtld-elf/alpha/rtld_machdep.h b/libexec/rtld-elf/alpha/rtld_machdep.h
index bbbe83a..11927d6 100644
--- a/libexec/rtld-elf/alpha/rtld_machdep.h
+++ b/libexec/rtld-elf/alpha/rtld_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: rtld_machdep.h,v 1.1 1999/04/09 00:28:43 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef RTLD_MACHDEP_H
diff --git a/libexec/rtld-elf/alpha/rtld_start.S b/libexec/rtld-elf/alpha/rtld_start.S
index 8c665d6..d7ec0d3 100644
--- a/libexec/rtld-elf/alpha/rtld_start.S
+++ b/libexec/rtld-elf/alpha/rtld_start.S
@@ -1,4 +1,4 @@
-/*	$Id: rtld_start.S,v 1.1 1998/09/04 19:03:57 dfr Exp $	*/
+/* $FreeBSD$	*/
 /*	From: NetBSD: rtld_start.S,v 1.1 1996/12/16 20:38:09 cgd Exp 	*/
 
 /*
diff --git a/libexec/rtld-elf/amd64/reloc.c b/libexec/rtld-elf/amd64/reloc.c
index bdae921..b4a2a75 100644
--- a/libexec/rtld-elf/amd64/reloc.c
+++ b/libexec/rtld-elf/amd64/reloc.c
@@ -22,7 +22,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: reloc.c,v 1.2 1999/04/09 00:28:43 jdp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/libexec/rtld-elf/amd64/rtld_machdep.h b/libexec/rtld-elf/amd64/rtld_machdep.h
index fe39d43..b44129a 100644
--- a/libexec/rtld-elf/amd64/rtld_machdep.h
+++ b/libexec/rtld-elf/amd64/rtld_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: rtld_machdep.h,v 1.1 1999/04/09 00:28:43 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef RTLD_MACHDEP_H
diff --git a/libexec/rtld-elf/amd64/rtld_start.S b/libexec/rtld-elf/amd64/rtld_start.S
index d678f2e..76f1392 100644
--- a/libexec/rtld-elf/amd64/rtld_start.S
+++ b/libexec/rtld-elf/amd64/rtld_start.S
@@ -22,7 +22,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: rtld_start.S,v 1.1.1.1 1998/03/07 19:24:35 jdp Exp $
+ * $FreeBSD$
  */
 
 	.text
diff --git a/libexec/rtld-elf/debug.c b/libexec/rtld-elf/debug.c
index dc31382..0c8ca35 100644
--- a/libexec/rtld-elf/debug.c
+++ b/libexec/rtld-elf/debug.c
@@ -22,7 +22,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: debug.c,v 1.1 1998/03/05 21:05:48 jdp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/libexec/rtld-elf/debug.h b/libexec/rtld-elf/debug.h
index be11f54..8d57ec7 100644
--- a/libexec/rtld-elf/debug.h
+++ b/libexec/rtld-elf/debug.h
@@ -22,7 +22,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: debug.h,v 1.1 1998/03/05 21:05:49 jdp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/libexec/rtld-elf/i386/reloc.c b/libexec/rtld-elf/i386/reloc.c
index bdae921..b4a2a75 100644
--- a/libexec/rtld-elf/i386/reloc.c
+++ b/libexec/rtld-elf/i386/reloc.c
@@ -22,7 +22,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: reloc.c,v 1.2 1999/04/09 00:28:43 jdp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/libexec/rtld-elf/i386/rtld_machdep.h b/libexec/rtld-elf/i386/rtld_machdep.h
index fe39d43..b44129a 100644
--- a/libexec/rtld-elf/i386/rtld_machdep.h
+++ b/libexec/rtld-elf/i386/rtld_machdep.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: rtld_machdep.h,v 1.1 1999/04/09 00:28:43 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef RTLD_MACHDEP_H
diff --git a/libexec/rtld-elf/i386/rtld_start.S b/libexec/rtld-elf/i386/rtld_start.S
index d678f2e..76f1392 100644
--- a/libexec/rtld-elf/i386/rtld_start.S
+++ b/libexec/rtld-elf/i386/rtld_start.S
@@ -22,7 +22,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: rtld_start.S,v 1.1.1.1 1998/03/07 19:24:35 jdp Exp $
+ * $FreeBSD$
  */
 
 	.text
diff --git a/libexec/rtld-elf/malloc.c b/libexec/rtld-elf/malloc.c
index 6689796..8aefa41 100644
--- a/libexec/rtld-elf/malloc.c
+++ b/libexec/rtld-elf/malloc.c
@@ -33,7 +33,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /*static char *sccsid = "from: @(#)malloc.c	5.11 (Berkeley) 2/23/91";*/
-static char *rcsid = "$Id: malloc.c,v 1.1.1.1 1998/03/07 19:24:35 jdp Exp $";
+static char *rcsid = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 /*
diff --git a/libexec/rtld-elf/map_object.c b/libexec/rtld-elf/map_object.c
index 523a80b..0d4114f 100644
--- a/libexec/rtld-elf/map_object.c
+++ b/libexec/rtld-elf/map_object.c
@@ -22,7 +22,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: map_object.c,v 1.2 1998/09/04 19:03:57 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/libexec/rtld-elf/rtld.1 b/libexec/rtld-elf/rtld.1
index 90e9d54..52a1b32 100644
--- a/libexec/rtld-elf/rtld.1
+++ b/libexec/rtld-elf/rtld.1
@@ -1,4 +1,4 @@
-.\"	$Id: rtld.1,v 1.14 1997/05/27 13:46:40 max Exp $
+.\" $FreeBSD$
 .\"
 .\" Copyright (c) 1995 Paul Kranenburg
 .\" All rights reserved.
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index f1dd696..58cdbef 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -22,7 +22,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: rtld.c,v 1.29 1999/07/18 00:02:19 jdp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h
index 95a057a..2fe8b15 100644
--- a/libexec/rtld-elf/rtld.h
+++ b/libexec/rtld-elf/rtld.h
@@ -22,7 +22,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: rtld.h,v 1.6 1999/04/09 00:28:31 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef RTLD_H /* { */
diff --git a/libexec/rtld-elf/xmalloc.c b/libexec/rtld-elf/xmalloc.c
index 18a073b..d6da334 100644
--- a/libexec/rtld-elf/xmalloc.c
+++ b/libexec/rtld-elf/xmalloc.c
@@ -22,7 +22,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: xmalloc.c,v 1.1 1998/03/05 21:05:54 jdp Exp $
+ * $FreeBSD$
  */
 
 #include <err.h>
diff --git a/libexec/talkd/Makefile b/libexec/talkd/Makefile
index 1754066..100e867 100644
--- a/libexec/talkd/Makefile
+++ b/libexec/talkd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	ntalkd
 SRCS=	talkd.c announce.c process.c table.c print.c ttymsg.c
diff --git a/libexec/talkd/announce.c b/libexec/talkd/announce.c
index cd4dc55..dccd8d8 100644
--- a/libexec/talkd/announce.c
+++ b/libexec/talkd/announce.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)announce.c	8.3 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: announce.c,v 1.9 1997/12/02 12:33:11 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/libexec/talkd/print.c b/libexec/talkd/print.c
index fffdf9c..8c1ba9b 100644
--- a/libexec/talkd/print.c
+++ b/libexec/talkd/print.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)print.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id: print.c,v 1.7 1997/12/24 19:39:57 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /* debug print routines */
diff --git a/libexec/talkd/process.c b/libexec/talkd/process.c
index 34c6a90..b3659a5 100644
--- a/libexec/talkd/process.c
+++ b/libexec/talkd/process.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)process.c	8.2 (Berkeley) 11/16/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/talkd/table.c b/libexec/talkd/table.c
index f1bcc22..5062c78 100644
--- a/libexec/talkd/table.c
+++ b/libexec/talkd/table.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)table.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/talkd/talkd.c b/libexec/talkd/talkd.c
index 72e4a5f..ca30ef7 100644
--- a/libexec/talkd/talkd.c
+++ b/libexec/talkd/talkd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)talkd.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id: talkd.c,v 1.9 1998/12/01 21:12:57 dillon Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile
index eb25b14..068087a 100644
--- a/libexec/telnetd/Makefile
+++ b/libexec/telnetd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 12/15/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	telnetd
 CFLAGS+=-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS
diff --git a/libexec/telnetd/ext.h b/libexec/telnetd/ext.h
index 05898fb..bce0e2a 100644
--- a/libexec/telnetd/ext.h
+++ b/libexec/telnetd/ext.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ext.h	8.2 (Berkeley) 12/15/93
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/libexec/telnetd/global.c b/libexec/telnetd/global.c
index 8e5c7bb..cedff57 100644
--- a/libexec/telnetd/global.c
+++ b/libexec/telnetd/global.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)global.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/telnetd/pathnames.h b/libexec/telnetd/pathnames.h
index 979f4d0..ed8ee88 100644
--- a/libexec/telnetd/pathnames.h
+++ b/libexec/telnetd/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/4/93
- *	$Id$
+ * $FreeBSD$
  */
 
 #if BSD > 43
diff --git a/libexec/telnetd/slc.c b/libexec/telnetd/slc.c
index 9578e52..f19f79f 100644
--- a/libexec/telnetd/slc.c
+++ b/libexec/telnetd/slc.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)slc.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id: slc.c,v 1.6 1997/12/03 07:15:58 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "telnetd.h"
diff --git a/libexec/telnetd/state.c b/libexec/telnetd/state.c
index aeb64bb..476a992 100644
--- a/libexec/telnetd/state.c
+++ b/libexec/telnetd/state.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)state.c	8.2 (Berkeley) 12/15/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "telnetd.h"
diff --git a/libexec/telnetd/sys_term.c b/libexec/telnetd/sys_term.c
index a1d0e66..d7e9ed3 100644
--- a/libexec/telnetd/sys_term.c
+++ b/libexec/telnetd/sys_term.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)sys_term.c	8.2 (Berkeley) 12/15/93";
 #endif
 static const char rcsid[] =
-	"$Id: sys_term.c,v 1.22 1999/08/09 02:19:38 green Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "telnetd.h"
diff --git a/libexec/telnetd/telnetd.8 b/libexec/telnetd/telnetd.8
index f9f2d48..0d50eb6 100644
--- a/libexec/telnetd/telnetd.8
+++ b/libexec/telnetd/telnetd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)telnetd.8	8.3 (Berkeley) 3/1/94
-.\"	$Id: telnetd.8,v 1.12 1998/05/04 02:37:29 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 1, 1994
 .Dt TELNETD 8
diff --git a/libexec/telnetd/telnetd.c b/libexec/telnetd/telnetd.c
index 7472bd3..5141c2a 100644
--- a/libexec/telnetd/telnetd.c
+++ b/libexec/telnetd/telnetd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)telnetd.c	8.2 (Berkeley) 12/15/93";
 #endif
 static const char rcsid[] =
-	"$Id: telnetd.c,v 1.19 1999/04/07 08:39:54 brian Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "telnetd.h"
diff --git a/libexec/telnetd/termstat.c b/libexec/telnetd/termstat.c
index b95aa5f..ee90344 100644
--- a/libexec/telnetd/termstat.c
+++ b/libexec/telnetd/termstat.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)termstat.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "telnetd.h"
diff --git a/libexec/telnetd/utility.c b/libexec/telnetd/utility.c
index 036a3c9..ee69173 100644
--- a/libexec/telnetd/utility.c
+++ b/libexec/telnetd/utility.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)utility.c	8.2 (Berkeley) 12/15/93";
 #endif
 static const char rcsid[] =
-	"$Id: utility.c,v 1.11 1997/12/08 07:46:53 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #ifdef __FreeBSD__
diff --git a/libexec/tftpd/Makefile b/libexec/tftpd/Makefile
index 301a0d7..ce43894 100644
--- a/libexec/tftpd/Makefile
+++ b/libexec/tftpd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id: Makefile,v 1.5 1997/02/22 14:22:35 peter Exp $
+# $FreeBSD$
 
 PROG=	tftpd
 SRCS=	tftpd.c tftpsubs.c
diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c
index 54cda4b..07475a4 100644
--- a/libexec/tftpd/tftpd.c
+++ b/libexec/tftpd/tftpd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tftpd.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id: tftpd.c,v 1.13 1999/04/06 23:05:59 brian Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/uucpd/Makefile b/libexec/uucpd/Makefile
index 9a296c9..3aeb623 100644
--- a/libexec/uucpd/Makefile
+++ b/libexec/uucpd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	uucpd
 MAN8=	uucpd.8
diff --git a/libexec/uucpd/pathnames.h b/libexec/uucpd/pathnames.h
index 782f23e..c06df36 100644
--- a/libexec/uucpd/pathnames.h
+++ b/libexec/uucpd/pathnames.h
@@ -32,7 +32,7 @@
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/4/93
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <paths.h>
diff --git a/libexec/uucpd/uucpd.8 b/libexec/uucpd/uucpd.8
index 3b964e3..3566229 100644
--- a/libexec/uucpd/uucpd.8
+++ b/libexec/uucpd/uucpd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rshd.8	8.1 (Berkeley) 6/4/93
-.\"	$Id: uucpd.8,v 1.5 1997/02/22 14:22:39 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd Feb 18, 1996
 .Dt UUCPD 8
diff --git a/libexec/uucpd/uucpd.c b/libexec/uucpd/uucpd.c
index 9c422e9..b1ac24d 100644
--- a/libexec/uucpd/uucpd.c
+++ b/libexec/uucpd/uucpd.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)uucpd.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-	"$Id: uucpd.c,v 1.18 1999/04/07 08:27:45 brian Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/xtend/Makefile b/libexec/xtend/Makefile
index d89e079..3418457 100644
--- a/libexec/xtend/Makefile
+++ b/libexec/xtend/Makefile
@@ -1,5 +1,5 @@
 # Makefile for xtend (Stark) 10/30/93
-# $Id$
+# $FreeBSD$
 
 BINMODE=	555
 
diff --git a/libexec/xtend/packet.c b/libexec/xtend/packet.c
index bdef357..f3a4e04 100644
--- a/libexec/xtend/packet.c
+++ b/libexec/xtend/packet.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/libexec/xtend/paths.h b/libexec/xtend/paths.h
index e41d214..da1993e 100644
--- a/libexec/xtend/paths.h
+++ b/libexec/xtend/paths.h
@@ -1,7 +1,7 @@
 /*
  * Pathnames for files used by xtend
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #define X10DIR		"/var/spool/xten"
diff --git a/libexec/xtend/status.c b/libexec/xtend/status.c
index ca85cdce..538f30b 100644
--- a/libexec/xtend/status.c
+++ b/libexec/xtend/status.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/libexec/xtend/user.c b/libexec/xtend/user.c
index 6f898df..f2c0190 100644
--- a/libexec/xtend/user.c
+++ b/libexec/xtend/user.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: user.c,v 1.7 1997/12/04 07:25:18 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/libexec/xtend/xten.h b/libexec/xtend/xten.h
index 23e8c6b..f07bb2c 100644
--- a/libexec/xtend/xten.h
+++ b/libexec/xtend/xten.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 extern char *X10housenames[];
diff --git a/libexec/xtend/xtend.8 b/libexec/xtend/xtend.8
index f970aa6a..d3593d2 100644
--- a/libexec/xtend/xtend.8
+++ b/libexec/xtend/xtend.8
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: xtend.8,v 1.9 1998/03/19 07:37:36 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Th XTEND 8 "30 Oct 1993"
 .Dd Oct 30, 1993
diff --git a/libexec/xtend/xtend.c b/libexec/xtend/xtend.c
index 01fcb68..1f37deb 100644
--- a/libexec/xtend/xtend.c
+++ b/libexec/xtend/xtend.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: xtend.c,v 1.7 1999/08/08 07:05:46 stark Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/xtend/xtend.h b/libexec/xtend/xtend.h
index 9d70444..e338603 100644
--- a/libexec/xtend/xtend.h
+++ b/libexec/xtend/xtend.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/libexec/ypxfr/Makefile b/libexec/ypxfr/Makefile
index b43aa87..f03b266 100644
--- a/libexec/ypxfr/Makefile
+++ b/libexec/ypxfr/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.6 1997/02/22 14:22:46 peter Exp $
+# $FreeBSD$
 
 PROG=	ypxfr
 SRCS=	yp_dblookup.c yp_dbwrite.c yp_error.c \
diff --git a/libexec/ypxfr/yp_dbwrite.c b/libexec/ypxfr/yp_dbwrite.c
index c429c27..bd45c43 100644
--- a/libexec/ypxfr/yp_dbwrite.c
+++ b/libexec/ypxfr/yp_dbwrite.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <db.h>
diff --git a/libexec/ypxfr/ypxfr.8 b/libexec/ypxfr/ypxfr.8
index fdc3bb0..6bdfd02 100644
--- a/libexec/ypxfr/ypxfr.8
+++ b/libexec/ypxfr/ypxfr.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: ypxfr.8,v 1.7 1997/12/08 07:49:51 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 5, 1995
 .Dt YPXFR 8
diff --git a/libexec/ypxfr/ypxfr_extern.h b/libexec/ypxfr/ypxfr_extern.h
index 5ca370c..34c3406 100644
--- a/libexec/ypxfr/ypxfr_extern.h
+++ b/libexec/ypxfr/ypxfr_extern.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 #include <sys/types.h>
 #include <limits.h>
diff --git a/libexec/ypxfr/ypxfr_getmap.c b/libexec/ypxfr/ypxfr_getmap.c
index bc2d936..085d631 100644
--- a/libexec/ypxfr/ypxfr_getmap.c
+++ b/libexec/ypxfr/ypxfr_getmap.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/libexec/ypxfr/ypxfr_main.c b/libexec/ypxfr/ypxfr_main.c
index 1f3076f..a4ad1a0 100644
--- a/libexec/ypxfr/ypxfr_main.c
+++ b/libexec/ypxfr/ypxfr_main.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: ypxfr_main.c,v 1.12 1998/08/02 16:44:18 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/libexec/ypxfr/ypxfr_misc.c b/libexec/ypxfr/ypxfr_misc.c
index e135ae6..e31e920 100644
--- a/libexec/ypxfr/ypxfr_misc.c
+++ b/libexec/ypxfr/ypxfr_misc.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/libexec/ypxfr/ypxfrd_getmap.c b/libexec/ypxfr/ypxfrd_getmap.c
index 1ac2df4..72555a3 100644
--- a/libexec/ypxfr/ypxfrd_getmap.c
+++ b/libexec/ypxfr/ypxfrd_getmap.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>