diff --git a/libexec/Makefile b/libexec/Makefile
index 7726d6e43ea3..d46d49318834 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$FreeBSD$
+#	$Id$
 
 SUBDIR=	atrun bootpd comsat fingerd ftpd getNAME getty lfs_cleanerd \
 	mail.local makekey mknetid named-xfer revnetgroup rexecd rlogind \
diff --git a/libexec/atrun/LEGAL b/libexec/atrun/LEGAL
index 936005d57c5a..2cd9453a7c34 100644
--- a/libexec/atrun/LEGAL
+++ b/libexec/atrun/LEGAL
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 -----BEGIN PGP SIGNED MESSAGE-----
 
diff --git a/libexec/atrun/Makefile b/libexec/atrun/Makefile
index 3bbad78dc06c..118bed195042 100644
--- a/libexec/atrun/Makefile
+++ b/libexec/atrun/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 MAINSRC= ${.CURDIR}/../../usr.bin/at
 
diff --git a/libexec/atrun/atrun.c b/libexec/atrun/atrun.c
index 479881f521f3..ffb28832ebb1 100644
--- a/libexec/atrun/atrun.c
+++ b/libexec/atrun/atrun.c
@@ -71,7 +71,7 @@
 /* File scope variables */
 
 static char *namep;
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$Id$";
 static debug = 0;
 
 void perr(const char *a);
diff --git a/libexec/atrun/atrun.man b/libexec/atrun/atrun.man
index 67ffe7dd7da3..b33de6877b83 100644
--- a/libexec/atrun/atrun.man
+++ b/libexec/atrun/atrun.man
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $Id$
 .Dd April 12, 1995
 .Dt ATRUN 8
 .Os "FreeBSD 2.1"
diff --git a/libexec/atrun/gloadavg.c b/libexec/atrun/gloadavg.c
index b13c0c8700b2..289fa29221b2 100644
--- a/libexec/atrun/gloadavg.c
+++ b/libexec/atrun/gloadavg.c
@@ -39,7 +39,7 @@
 
 /* File scope variables */
 
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$Id$";
 
 /* Global functions */
 
diff --git a/libexec/atrun/gloadavg.h b/libexec/atrun/gloadavg.h
index 48890ce54b59..24c4e12a8ad5 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[] = "$FreeBSD$";
+static char atrun_h_rcsid[] = "$Id$";
 #endif
diff --git a/libexec/bootpd/Announce b/libexec/bootpd/Announce
index 19912d9c22af..a605c6a98fda 100644
--- a/libexec/bootpd/Announce
+++ b/libexec/bootpd/Announce
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 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 37a48ceb9ea3..23310e1cf285 100644
--- a/libexec/bootpd/Changes
+++ b/libexec/bootpd/Changes
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 Changes, most recent first
 Date, <email> Real Name
diff --git a/libexec/bootpd/Makefile b/libexec/bootpd/Makefile
index f428be888778..bc0722589ab1 100644
--- a/libexec/bootpd/Makefile
+++ b/libexec/bootpd/Makefile
@@ -1,5 +1,5 @@
 # bootpd/Makefile
-# $FreeBSD$
+# $Id$
 
 PROG=	bootpd
 CFLAGS+= -DETC_ETHERS
diff --git a/libexec/bootpd/Makefile.UNIX b/libexec/bootpd/Makefile.UNIX
index 6ba8b498754b..50187dae4588 100644
--- a/libexec/bootpd/Makefile.UNIX
+++ b/libexec/bootpd/Makefile.UNIX
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 #
 # Makefile for the BOOTP programs:
 #   bootpd	- BOOTP server daemon
diff --git a/libexec/bootpd/Makefile.inc b/libexec/bootpd/Makefile.inc
index 829da300445d..d055f527cdef 100644
--- a/libexec/bootpd/Makefile.inc
+++ b/libexec/bootpd/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $Id$
 
 BINDIR?=	/usr/libexec
diff --git a/libexec/bootpd/Problems b/libexec/bootpd/Problems
index a74c83ecacdb..bec9ac0faa1c 100644
--- a/libexec/bootpd/Problems
+++ b/libexec/bootpd/Problems
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 Common problems and ways to work around them:
 
diff --git a/libexec/bootpd/README b/libexec/bootpd/README
index 6754a37b845a..ddfaebe9bab3 100644
--- a/libexec/bootpd/README
+++ b/libexec/bootpd/README
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 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 6ff568087511..88f7ed28c466 100644
--- a/libexec/bootpd/bootp.h
+++ b/libexec/bootpd/bootp.h
@@ -23,7 +23,7 @@ SOFTWARE.
 /*
  * Bootstrap Protocol (BOOTP).  RFC951 and RFC1395.
  *
- * $FreeBSD$
+ * $Id$
  *
  *
  * This file specifies the "implementation-independent" BOOTP protocol
diff --git a/libexec/bootpd/bootpd.c b/libexec/bootpd/bootpd.c
index b41a8d9626a4..db4eecd4101f 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.
 
-	$FreeBSD$
+	$Id$
 
 ************************************************************************/
 
diff --git a/libexec/bootpd/bootpgw/Makefile b/libexec/bootpd/bootpgw/Makefile
index 4a658533741f..04f02ebc965e 100644
--- a/libexec/bootpd/bootpgw/Makefile
+++ b/libexec/bootpd/bootpgw/Makefile
@@ -1,5 +1,5 @@
 # Makefile
-# $FreeBSD$
+# $Id$
 
 PROG=	bootpgw
 NOMAN=  true
diff --git a/libexec/bootpd/bootptab.mcs b/libexec/bootpd/bootptab.mcs
index 8b3e26d8f2e0..a798f8afa9e1 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.
 #
-#	$FreeBSD$
+#	$Id$
 #
 # Legend:	(see bootptab.5)
 #	first field -- hostname (not indented)
diff --git a/libexec/bootpd/dovend.c b/libexec/bootpd/dovend.c
index 02e98014aa63..447826f3ca0e 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.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/dumptab.c b/libexec/bootpd/dumptab.c
index 9b100a9c8ca4..3827fd99b00e 100644
--- a/libexec/bootpd/dumptab.c
+++ b/libexec/bootpd/dumptab.c
@@ -1,7 +1,7 @@
 /*
  * dumptab.c - handles dumping the database
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/getether.c b/libexec/bootpd/getether.c
index 12507fcbbba1..cf01b03fe4d0 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>
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/getif.c b/libexec/bootpd/getif.c
index cdf1ceeaa6e6..ecfa6107440e 100644
--- a/libexec/bootpd/getif.c
+++ b/libexec/bootpd/getif.c
@@ -1,7 +1,7 @@
 /*
  * getif.c : get an interface structure
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/hash.c b/libexec/bootpd/hash.c
index 4829b0b185a3..f9597513f8b9 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.
 
-	$FreeBSD$
+	$Id$
 
 ************************************************************************/
 
diff --git a/libexec/bootpd/hwaddr.c b/libexec/bootpd/hwaddr.c
index daac40454991..bc41cff2d7e6 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)
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/hwaddr.h b/libexec/bootpd/hwaddr.h
index 4e82a3c32ddb..b0a8c290801b 100644
--- a/libexec/bootpd/hwaddr.h
+++ b/libexec/bootpd/hwaddr.h
@@ -1,7 +1,7 @@
 /* 
  * hwaddr.h
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef	HWADDR_H
diff --git a/libexec/bootpd/lookup.c b/libexec/bootpd/lookup.c
index e915f53c4161..af3b37aa99a6 100644
--- a/libexec/bootpd/lookup.c
+++ b/libexec/bootpd/lookup.c
@@ -1,7 +1,7 @@
 /*
  * lookup.c - Lookup IP address, HW address, netmask
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/patchlevel.h b/libexec/bootpd/patchlevel.h
index 6e29de0298d0..85566b5015a9 100644
--- a/libexec/bootpd/patchlevel.h
+++ b/libexec/bootpd/patchlevel.h
@@ -1,7 +1,7 @@
 /* 
  * patchlevel.h 
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #define VERSION 	"2.4"
diff --git a/libexec/bootpd/readfile.c b/libexec/bootpd/readfile.c
index 3b6d62caa1e5..8dfd43023d0b 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.
 
-	$FreeBSD$
+	$Id$
 
 ************************************************************************/
 
diff --git a/libexec/bootpd/rtmsg.c b/libexec/bootpd/rtmsg.c
index 9df4374d0b9c..b6bd36389402 100644
--- a/libexec/bootpd/rtmsg.c
+++ b/libexec/bootpd/rtmsg.c
@@ -39,7 +39,7 @@
 
 /*
  * from arp.c	8.2 (Berkeley) 1/2/94
- * $FreeBSD$
+ * $Id$
  */
 
 #include <sys/param.h>
diff --git a/libexec/bootpd/tools/Makefile b/libexec/bootpd/tools/Makefile
index e905bffa7696..b1f38e76ecbd 100644
--- a/libexec/bootpd/tools/Makefile
+++ b/libexec/bootpd/tools/Makefile
@@ -1,5 +1,5 @@
 # Makefile
-# $FreeBSD$
+# $Id$
 
 SUBDIR=	bootpef bootptest
 
diff --git a/libexec/bootpd/tools/Makefile.inc b/libexec/bootpd/tools/Makefile.inc
index 16007eec373b..0a2ab66f28f4 100644
--- a/libexec/bootpd/tools/Makefile.inc
+++ b/libexec/bootpd/tools/Makefile.inc
@@ -1,4 +1,4 @@
 # Makefile.inc
-# $FreeBSD$
+# $Id$
 
 BINDIR=/usr/sbin
diff --git a/libexec/bootpd/tools/bootpef/Makefile b/libexec/bootpd/tools/bootpef/Makefile
index dfb766255864..7d176069a8d6 100644
--- a/libexec/bootpd/tools/bootpef/Makefile
+++ b/libexec/bootpd/tools/bootpef/Makefile
@@ -1,5 +1,5 @@
 # Makefile
-# $FreeBSD$
+# $Id$
 
 PROG=	bootpef
 MAN8=	bootpef.8
diff --git a/libexec/bootpd/tools/bootpef/bootpef.c b/libexec/bootpd/tools/bootpef/bootpef.c
index a0f652eb580a..c7e927687dbf 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.
 
-	$FreeBSD$
+	$Id$
 
 ************************************************************************/
 
diff --git a/libexec/bootpd/tools/bootptest/Makefile b/libexec/bootpd/tools/bootptest/Makefile
index 1bc8887432f2..148a556b1926 100644
--- a/libexec/bootpd/tools/bootptest/Makefile
+++ b/libexec/bootpd/tools/bootptest/Makefile
@@ -1,5 +1,5 @@
 # Makefile
-# $FreeBSD$
+# $Id$
 
 PROG=	bootptest
 MAN8=	bootptest.8
diff --git a/libexec/bootpd/tools/bootptest/bootptest.c b/libexec/bootpd/tools/bootptest/bootptest.c
index 23ed7ded74ac..2e2311284fc2 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>
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 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 7e799ae50075..c8e1c2eb44f0 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>
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <stdio.h>
diff --git a/libexec/bootpd/trygetea.c b/libexec/bootpd/trygetea.c
index 746623fd16d8..41800d78c126 100644
--- a/libexec/bootpd/trygetea.c
+++ b/libexec/bootpd/trygetea.c
@@ -1,7 +1,7 @@
 /*
  * trygetea.c - test program for getether.c
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/trygetif.c b/libexec/bootpd/trygetif.c
index 76186df56b49..e6226dcb9ef0 100644
--- a/libexec/bootpd/trygetif.c
+++ b/libexec/bootpd/trygetif.c
@@ -1,7 +1,7 @@
 /*
  * trygetif.c - test program for getif.c
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <sys/types.h>
diff --git a/libexec/bootpd/trylook.c b/libexec/bootpd/trylook.c
index d322ce46d165..0681dceebbc4 100644
--- a/libexec/bootpd/trylook.c
+++ b/libexec/bootpd/trylook.c
@@ -1,7 +1,7 @@
 /*
  * trylook.c - test program for lookup.c
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <sys/types.h>
diff --git a/libexec/comsat/Makefile b/libexec/comsat/Makefile
index 3bb9d6de6f87..7352ab55103a 100644
--- a/libexec/comsat/Makefile
+++ b/libexec/comsat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$FreeBSD$
+#	$Id$
 
 PROG=	comsat
 MAN8=	comsat.8
diff --git a/libexec/comsat/comsat.8 b/libexec/comsat/comsat.8
index 1b8f463f7a5b..916d1c90d064 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
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd June 4, 1993
 .Dt COMSAT 8
diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c
index ce3a8ab4920a..c3b876a77765 100644
--- a/libexec/comsat/comsat.c
+++ b/libexec/comsat/comsat.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef lint
diff --git a/libexec/fingerd/Makefile b/libexec/fingerd/Makefile
index 21601fafd2bb..4deac6475ff2 100644
--- a/libexec/fingerd/Makefile
+++ b/libexec/fingerd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$FreeBSD$
+#	$Id$
 
 PROG=	fingerd
 MAN8=	fingerd.8
diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c
index d6a0961e0f5e..455d6e988ce6 100644
--- a/libexec/fingerd/fingerd.c
+++ b/libexec/fingerd/fingerd.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)fingerd.c	8.1 (Berkeley) 6/4/93";
 */
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index a606963f8178..75df272ae184 100644
--- a/libexec/ftpd/Makefile
+++ b/libexec/ftpd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/4/94
-#	$FreeBSD$
+#	$Id$
 
 PROG=	ftpd
 MAN8=	ftpd.8
diff --git a/libexec/ftpd/extern.h b/libexec/ftpd/extern.h
index 84bb309efa5e..ff1cdfbf8589 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
- *	$FreeBSD$
+ *	$Id$
  */
 
 void	blkfree __P((char **));
diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y
index 15d59ce374f6..5951e7099e11 100644
--- a/libexec/ftpd/ftpcmd.y
+++ b/libexec/ftpd/ftpcmd.y
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ftpcmd.y	8.3 (Berkeley) 4/6/94
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*
diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8
index 0b6daecb27f2..98fb588150a0 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
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd April 19, 1994
 .Dt FTPD 8
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 43279944abb7..64ddc4b1f3fa 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
diff --git a/libexec/ftpd/logwtmp.c b/libexec/ftpd/logwtmp.c
index b5b8192885d8..9562795fa8c3 100644
--- a/libexec/ftpd/logwtmp.c
+++ b/libexec/ftpd/logwtmp.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef lint
diff --git a/libexec/ftpd/pathnames.h b/libexec/ftpd/pathnames.h
index 491dd342dd7c..8842742acfe2 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
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <paths.h>
diff --git a/libexec/ftpd/popen.c b/libexec/ftpd/popen.c
index d0c9bb63e4e1..b00235a79684 100644
--- a/libexec/ftpd/popen.c
+++ b/libexec/ftpd/popen.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
diff --git a/libexec/ftpd/skey-stuff.c b/libexec/ftpd/skey-stuff.c
index 2ab0cb50c9d2..b6aba40d8a42 100644
--- a/libexec/ftpd/skey-stuff.c
+++ b/libexec/ftpd/skey-stuff.c
@@ -1,6 +1,6 @@
 /* Author: Wietse Venema, Eindhoven University of Technology. 
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <stdio.h>
diff --git a/libexec/getNAME/Makefile b/libexec/getNAME/Makefile
index a88492c48eb9..6600d2386463 100644
--- a/libexec/getNAME/Makefile
+++ b/libexec/getNAME/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $Id$
 
 PROG=	getNAME
 
diff --git a/libexec/getNAME/getNAME.1 b/libexec/getNAME/getNAME.1
index ba6c182e450d..c58bbe2388e3 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.
 .\"
-.\" $FreeBSD$
+.\" $Id$
 
 .Dd July 8, 1996
 .Dt getNAME 1
diff --git a/libexec/getNAME/getNAME.c b/libexec/getNAME/getNAME.c
index 4cf98d460dc5..f7f29bc7c46e 100644
--- a/libexec/getNAME/getNAME.c
+++ b/libexec/getNAME/getNAME.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $Id$
  *
  */
 
diff --git a/libexec/getty/Makefile b/libexec/getty/Makefile
index cfd805f5d620..f51fe2418fec 100644
--- a/libexec/getty/Makefile
+++ b/libexec/getty/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$FreeBSD$
+#	$Id$
 
 PROG=	getty
 SRCS=	main.c init.c subr.c chat.c
diff --git a/libexec/getty/chat.c b/libexec/getty/chat.c
index 21fd69bd87fb..24741950ae81 100644
--- a/libexec/getty/chat.c
+++ b/libexec/getty/chat.c
@@ -22,7 +22,7 @@
  * Modem chat module - send/expect style functions for getty
  * For semi-intelligent modem handling.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <sys/param.h>
diff --git a/libexec/getty/extern.h b/libexec/getty/extern.h
index 0ac3f11a0f98..bd84a130845e 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
- *	$FreeBSD$
+ *	$Id$
  */
 
 struct delayval;
diff --git a/libexec/getty/getty.8 b/libexec/getty/getty.8
index 17743b52dce1..c1b193667f51 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
-.\"	$FreeBSD$
+.\"	$Id$
 .\" "
 .Dd June 4, 1993
 .Dt GETTY 8
diff --git a/libexec/getty/gettytab.5 b/libexec/getty/gettytab.5
index d7384f019bc8..ab92e0b1d69c 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
-.\"	$FreeBSD$
+.\"	$Id$
 .\" "
 .Dd April 19, 1994
 .Dt GETTYTAB 5
diff --git a/libexec/getty/gettytab.h b/libexec/getty/gettytab.h
index 0456f7c81494..1321ad19e9c6 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
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*
diff --git a/libexec/getty/init.c b/libexec/getty/init.c
index f6551f96dd44..9df07283ec3e 100644
--- a/libexec/getty/init.c
+++ b/libexec/getty/init.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)init.c	8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$Id$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/getty/main.c b/libexec/getty/main.c
index ff895a2b4e92..53c247f4661f 100644
--- a/libexec/getty/main.c
+++ b/libexec/getty/main.c
@@ -39,7 +39,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)main.c	8.1 (Berkeley) 6/20/93";*/
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/libexec/getty/pathnames.h b/libexec/getty/pathnames.h
index 63d7c6e057dd..fd397dd60a8b 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
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <paths.h>
diff --git a/libexec/getty/subr.c b/libexec/getty/subr.c
index e01bd1a18fd7..270db52dce4d 100644
--- a/libexec/getty/subr.c
+++ b/libexec/getty/subr.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)subr.c	8.1 (Berkeley) 6/4/93";*/
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$Id$";
 #endif /* not lint */
 
 /*
diff --git a/libexec/getty/ttys.5 b/libexec/getty/ttys.5
index 042cafbcf224..cfa964f9d6cf 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
-.\"	$FreeBSD$
+.\"	$Id$
 .\" "
 .Dd November 17, 1996
 .Dt TTYS 5
diff --git a/libexec/lfs_cleanerd/Makefile b/libexec/lfs_cleanerd/Makefile
index 561f442209c3..cda92366f479 100644
--- a/libexec/lfs_cleanerd/Makefile
+++ b/libexec/lfs_cleanerd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$FreeBSD$
+#	$Id$
 
 PROG=	lfs_cleanerd
 CFLAGS+=-I/sys/ufs/lfs -I${.CURDIR} ${DEBUG}
diff --git a/libexec/lfs_cleanerd/clean.h b/libexec/lfs_cleanerd/clean.h
index 6f9dbcc16449..b28cffe10ba7 100644
--- a/libexec/lfs_cleanerd/clean.h
+++ b/libexec/lfs_cleanerd/clean.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clean.h	8.1 (Berkeley) 6/4/93
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*
diff --git a/libexec/lfs_cleanerd/cleanerd.c b/libexec/lfs_cleanerd/cleanerd.c
index b736bd546646..44bd70236917 100644
--- a/libexec/lfs_cleanerd/cleanerd.c
+++ b/libexec/lfs_cleanerd/cleanerd.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef lint
diff --git a/libexec/lfs_cleanerd/lfs_cleanerd.8 b/libexec/lfs_cleanerd/lfs_cleanerd.8
index b33ce5f0a1ce..2163de6e04d0 100644
--- a/libexec/lfs_cleanerd/lfs_cleanerd.8
+++ b/libexec/lfs_cleanerd/lfs_cleanerd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)lfs_cleanerd.8	8.2 (Berkeley) 12/11/93
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd "December 11, 1993"
 .Dt LFS_CLEANERD 8
diff --git a/libexec/lfs_cleanerd/library.c b/libexec/lfs_cleanerd/library.c
index 93951c6aad1f..b72aad8b435d 100644
--- a/libexec/lfs_cleanerd/library.c
+++ b/libexec/lfs_cleanerd/library.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef lint
diff --git a/libexec/lfs_cleanerd/print.c b/libexec/lfs_cleanerd/print.c
index 57c4739fd1b1..8468f123efe0 100644
--- a/libexec/lfs_cleanerd/print.c
+++ b/libexec/lfs_cleanerd/print.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef lint
diff --git a/libexec/mail.local/Makefile b/libexec/mail.local/Makefile
index f0e8dc2ed4ab..59eaed29c337 100644
--- a/libexec/mail.local/Makefile
+++ b/libexec/mail.local/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-#	$FreeBSD$
+#	$Id$
 
 PROG=	mail.local
 MAN8=	mail.local.8
diff --git a/libexec/mail.local/mail.local.8 b/libexec/mail.local/mail.local.8
index 8a5d225a185b..8ffd5357ddf4 100644
--- a/libexec/mail.local/mail.local.8
+++ b/libexec/mail.local/mail.local.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mail.local.8	8.2 (Berkeley) 12/11/93
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd December 11, 1993
 .Dt MAIL.LOCAL 8
diff --git a/libexec/mail.local/mail.local.c b/libexec/mail.local/mail.local.c
index adb556d51a53..1809f35696e0 100644
--- a/libexec/mail.local/mail.local.c
+++ b/libexec/mail.local/mail.local.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef lint
diff --git a/libexec/makekey/Makefile b/libexec/makekey/Makefile
index 23c597b61ef8..2ec0edde9e0f 100644
--- a/libexec/makekey/Makefile
+++ b/libexec/makekey/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$FreeBSD$
+#	$Id$
 
 PROG=	makekey
 MAN8=	makekey.8
diff --git a/libexec/makekey/makekey.8 b/libexec/makekey/makekey.8
index 2bed4b9953c6..dc367bf50f57 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
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd December 11, 1993
 .Dt MAKEKEY 8
diff --git a/libexec/makekey/makekey.c b/libexec/makekey/makekey.c
index a892569b7c8b..482908d75362 100644
--- a/libexec/makekey/makekey.c
+++ b/libexec/makekey/makekey.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef lint
diff --git a/libexec/mknetid/Makefile b/libexec/mknetid/Makefile
index 8342e3de3b0a..db5999b08ae5 100644
--- a/libexec/mknetid/Makefile
+++ b/libexec/mknetid/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 PROG=	mknetid
 SRCS=	mknetid.c hash.c parse_group.c
diff --git a/libexec/mknetid/hash.c b/libexec/mknetid/hash.c
index e364a27e0058..f875ba158a4d 100644
--- a/libexec/mknetid/hash.c
+++ b/libexec/mknetid/hash.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <stdio.h>
@@ -39,7 +39,7 @@
 #include "hash.h"
 
 #ifndef lint
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$Id$";
 #endif
 
 
diff --git a/libexec/mknetid/hash.h b/libexec/mknetid/hash.h
index 712bd1ef5b82..5f6cd2e98cd2 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.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 /* Groupid entry hung off a member_entry node. */
diff --git a/libexec/mknetid/mknetid.8 b/libexec/mknetid/mknetid.8
index 0f39120b714f..5b7ff6dbaddf 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.
 .\"
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd June 23, 1996
 .Dt MKNETID 8
diff --git a/libexec/mknetid/mknetid.c b/libexec/mknetid/mknetid.c
index 28cbf6ece232..81e3066c1e35 100644
--- a/libexec/mknetid/mknetid.c
+++ b/libexec/mknetid/mknetid.c
@@ -35,7 +35,7 @@
  * Center for Telecommunications Research
  * Columbia University, New York City
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <sys/types.h>
@@ -55,7 +55,7 @@
 #include "hash.h"
 
 #ifndef lint
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$Id$";
 #endif
 
 #define LINSIZ 1024
diff --git a/libexec/mknetid/parse_group.c b/libexec/mknetid/parse_group.c
index 1d50320e87e3..88a12028595d 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 /* LIBC_SCCS and not lint */
 
 #ifndef lint
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$Id$";
 #endif
 
 /*
diff --git a/libexec/named-xfer/Makefile b/libexec/named-xfer/Makefile
index ef44a3c36cea..a02cb03c7626 100644
--- a/libexec/named-xfer/Makefile
+++ b/libexec/named-xfer/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
 
 .include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
 
diff --git a/libexec/rbootd/Makefile b/libexec/rbootd/Makefile
index 6ea830a94fda..dfb087004e34 100644
--- a/libexec/rbootd/Makefile
+++ b/libexec/rbootd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$FreeBSD$
+#	$Id$
 
 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 5cd3c35c504e..41ec1f7a6211 100644
--- a/libexec/rbootd/bpf.c
+++ b/libexec/rbootd/bpf.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)bpf.c	8.1 (Berkeley) 6/4/93
- *	$FreeBSD$
+ *	$Id$
  *
  * Utah $Hdr: bpf.c 3.1 92/07/06$
  * Author: Jeff Forys, University of Utah CSS
diff --git a/libexec/rbootd/parseconf.c b/libexec/rbootd/parseconf.c
index 51a57e28a51e..7d7bce246b81 100644
--- a/libexec/rbootd/parseconf.c
+++ b/libexec/rbootd/parseconf.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)parseconf.c	8.1 (Berkeley) 6/4/93
- *	$FreeBSD$
+ *	$Id$
  *
  * Utah $Hdr: parseconf.c 3.1 92/07/06$
  * Author: Jeff Forys, University of Utah CSS
diff --git a/libexec/rbootd/rbootd.8 b/libexec/rbootd/rbootd.8
index 1262cb457ecf..8b2a281359a5 100644
--- a/libexec/rbootd/rbootd.8
+++ b/libexec/rbootd/rbootd.8
@@ -38,7 +38,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rbootd.8	8.2 (Berkeley) 12/11/93
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .\" 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 070dd6c00561..c889d921d488 100644
--- a/libexec/rbootd/rbootd.c
+++ b/libexec/rbootd/rbootd.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)rbootd.c	8.2 (Berkeley) 2/22/94
- *	$FreeBSD$
+ *	$Id$
  *
  * Utah $Hdr: rbootd.c 3.1 92/07/06$
  * Author: Jeff Forys, University of Utah CSS
diff --git a/libexec/revnetgroup/Makefile b/libexec/revnetgroup/Makefile
index 88016eea4148..dec0e7b8e653 100644
--- a/libexec/revnetgroup/Makefile
+++ b/libexec/revnetgroup/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 PROG=	revnetgroup
 SRCS=	revnetgroup.c hash.c parse_netgroup.c
diff --git a/libexec/revnetgroup/hash.c b/libexec/revnetgroup/hash.c
index 2f63cc7c4c1e..2c1cb16e7f22 100644
--- a/libexec/revnetgroup/hash.c
+++ b/libexec/revnetgroup/hash.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <stdio.h>
@@ -39,7 +39,7 @@
 #include "hash.h"
 
 #ifndef lint
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$Id$";
 #endif
 
 /*
diff --git a/libexec/revnetgroup/hash.h b/libexec/revnetgroup/hash.h
index d46478932286..7106967d99e5 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.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 /* Groupname entry hung off a member_entry node. */
diff --git a/libexec/revnetgroup/parse_netgroup.c b/libexec/revnetgroup/parse_netgroup.c
index 529d399fb2f5..14e7e238a7ca 100644
--- a/libexec/revnetgroup/parse_netgroup.c
+++ b/libexec/revnetgroup/parse_netgroup.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "$FreeBSD$";
+static char sccsid[] = "$Id$";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -52,7 +52,7 @@ static char sccsid[] = "$FreeBSD$";
 #include "hash.h"
 
 #ifndef lint
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$Id$";
 #endif
 
 /*
diff --git a/libexec/revnetgroup/revnetgroup.8 b/libexec/revnetgroup/revnetgroup.8
index d9fc3992759a..2d03f817ef54 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.
 .\"
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd October 24, 1995
 .Dt REVNETGROUP 8
diff --git a/libexec/revnetgroup/revnetgroup.c b/libexec/revnetgroup/revnetgroup.c
index 3a5eb568badf..c2a3574884e6 100644
--- a/libexec/revnetgroup/revnetgroup.c
+++ b/libexec/revnetgroup/revnetgroup.c
@@ -35,7 +35,7 @@
  * Center for Telecommunications Research
  * Columbia University, New York City
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <stdio.h>
@@ -46,7 +46,7 @@
 #include "hash.h"
 
 #ifndef lint
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$Id$";
 #endif
 
 /* Default location of netgroup file. */
diff --git a/libexec/rexecd/Makefile b/libexec/rexecd/Makefile
index 4048ea897ef4..ebd3d1597846 100644
--- a/libexec/rexecd/Makefile
+++ b/libexec/rexecd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$FreeBSD$
+#	$Id$
 
 PROG=	rexecd
 MAN8=	rexecd.8
diff --git a/libexec/rexecd/rexecd.8 b/libexec/rexecd/rexecd.8
index 5822de56dc6f..df8950419db9 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
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd September 23, 1994
 .Dt REXECD 8
diff --git a/libexec/rexecd/rexecd.c b/libexec/rexecd/rexecd.c
index 163eefc95bb5..a54a5af26ef3 100644
--- a/libexec/rexecd/rexecd.c
+++ b/libexec/rexecd/rexecd.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef lint
diff --git a/libexec/rlogind/Makefile b/libexec/rlogind/Makefile
index 5a9d2da6d1c4..41136e21b162 100644
--- a/libexec/rlogind/Makefile
+++ b/libexec/rlogind/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$FreeBSD$
+#	$Id$
 
 PROG=	rlogind
 SRCS=	rlogind.c
diff --git a/libexec/rlogind/rlogind.8 b/libexec/rlogind/rlogind.8
index f2b151b53dbc..7c565e36872a 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
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd June 4, 1993
 .Dt RLOGIND 8
diff --git a/libexec/rlogind/rlogind.c b/libexec/rlogind/rlogind.c
index 64b346e6e9a8..4a9d7a6d108c 100644
--- a/libexec/rlogind/rlogind.c
+++ b/libexec/rlogind/rlogind.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef lint
diff --git a/libexec/rpc.rquotad/Makefile b/libexec/rpc.rquotad/Makefile
index 2c251ac870a9..53ca412a46ee 100644
--- a/libexec/rpc.rquotad/Makefile
+++ b/libexec/rpc.rquotad/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 PROG =	rpc.rquotad
 SRCS =	rquotad.c
diff --git a/libexec/rpc.rquotad/rpc.rquotad.8 b/libexec/rpc.rquotad/rpc.rquotad.8
index 7c4aceaef3f1..359d007ed313 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.
 .\"
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd June 22, 1994
 .Dt RPC.RQUOTAD 8
diff --git a/libexec/rpc.rstatd/Makefile b/libexec/rpc.rstatd/Makefile
index 8abc40204e91..026c8e084dba 100644
--- a/libexec/rpc.rstatd/Makefile
+++ b/libexec/rpc.rstatd/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 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 fae6675afccf..5a54b819b537 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.
 .\"
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .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 e6c71422515e..bb67bedfaf8e 100644
--- a/libexec/rpc.rstatd/rstat_proc.c
+++ b/libexec/rpc.rstatd/rstat_proc.c
@@ -29,7 +29,7 @@
 #ifndef lint
 /*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";*/
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$Id$";
 #endif
 
 /*
diff --git a/libexec/rpc.rstatd/rstatd.c b/libexec/rpc.rstatd/rstatd.c
index 724cea16df55..72c449f3c303 100644
--- a/libexec/rpc.rstatd/rstatd.c
+++ b/libexec/rpc.rstatd/rstatd.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$Id$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/libexec/rpc.rusersd/Makefile b/libexec/rpc.rusersd/Makefile
index 203db267d4de..48f38531dd9c 100644
--- a/libexec/rpc.rusersd/Makefile
+++ b/libexec/rpc.rusersd/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 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 f65207e60d03..81345f8d191a 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.
 .\"
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .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 1289c3067673..db6288bcc800 100644
--- a/libexec/rpc.rusersd/rusers_proc.c
+++ b/libexec/rpc.rusersd/rusers_proc.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$Id$";
 #endif /* not lint */
 
 #include <signal.h>
diff --git a/libexec/rpc.rusersd/rusersd.c b/libexec/rpc.rusersd/rusersd.c
index 919d1222454f..8538797e0f0a 100644
--- a/libexec/rpc.rusersd/rusersd.c
+++ b/libexec/rpc.rusersd/rusersd.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$Id$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/libexec/rpc.rwalld/Makefile b/libexec/rpc.rwalld/Makefile
index a867320ee382..f9bf277da151 100644
--- a/libexec/rpc.rwalld/Makefile
+++ b/libexec/rpc.rwalld/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 PROG =	rpc.rwalld
 SRCS =	rwalld.c
diff --git a/libexec/rpc.rwalld/rpc.rwalld.8 b/libexec/rpc.rwalld/rpc.rwalld.8
index 9f2d66cff0cb..cbd64a99548f 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.
 .\"
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd June 7, 1993
 .Dt RPC.RWALLD 8
diff --git a/libexec/rpc.rwalld/rwalld.c b/libexec/rpc.rwalld/rwalld.c
index b0511a4b2c41..90b0ffe04d0e 100644
--- a/libexec/rpc.rwalld/rwalld.c
+++ b/libexec/rpc.rwalld/rwalld.c
@@ -28,7 +28,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$Id$";
 #endif /* not lint */
 
 #include <unistd.h>
diff --git a/libexec/rpc.sprayd/Makefile b/libexec/rpc.sprayd/Makefile
index 658e965020c9..233c4d8f91e5 100644
--- a/libexec/rpc.sprayd/Makefile
+++ b/libexec/rpc.sprayd/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 PROG =	rpc.sprayd
 SRCS =	sprayd.c
diff --git a/libexec/rpc.sprayd/rpc.sprayd.8 b/libexec/rpc.sprayd/rpc.sprayd.8
index 48171b5a2ab3..1b7b82366a62 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.
 .\"
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd June 22, 1994
 .Dt RPC.SPRAYD 8
diff --git a/libexec/rpc.sprayd/sprayd.c b/libexec/rpc.sprayd/sprayd.c
index 348dda4ec437..44883f4a111e 100644
--- a/libexec/rpc.sprayd/sprayd.c
+++ b/libexec/rpc.sprayd/sprayd.c
@@ -27,11 +27,11 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$Id$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/libexec/rshd/Makefile b/libexec/rshd/Makefile
index 5cf9c23ee941..5d5cef89cc16 100644
--- a/libexec/rshd/Makefile
+++ b/libexec/rshd/Makefile
@@ -1,5 +1,5 @@
 # From:	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD$
+# $Id$
 
 PROG=	rshd
 SRCS=	rshd.c
diff --git a/libexec/rshd/rshd.8 b/libexec/rshd/rshd.8
index 87432725ef35..1bb3c0a6f0ad 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
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd June 4, 1993
 .Dt RSHD 8
diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c
index 61ede518fbfe..71d4650b6d5e 100644
--- a/libexec/rshd/rshd.c
+++ b/libexec/rshd/rshd.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef lint
diff --git a/libexec/talkd/Makefile b/libexec/talkd/Makefile
index 44f56eb308a2..1754066e11b3 100644
--- a/libexec/talkd/Makefile
+++ b/libexec/talkd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$FreeBSD$
+#	$Id$
 
 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 55f3ca9e152c..2ce6e539e9a0 100644
--- a/libexec/talkd/announce.c
+++ b/libexec/talkd/announce.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef lint
diff --git a/libexec/talkd/print.c b/libexec/talkd/print.c
index 8df410024f45..af9e1194ac7a 100644
--- a/libexec/talkd/print.c
+++ b/libexec/talkd/print.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef lint
diff --git a/libexec/talkd/process.c b/libexec/talkd/process.c
index 54973927fe93..df087e3c4f7b 100644
--- a/libexec/talkd/process.c
+++ b/libexec/talkd/process.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef lint
diff --git a/libexec/talkd/table.c b/libexec/talkd/table.c
index c410f8c4a569..a31c611afa28 100644
--- a/libexec/talkd/table.c
+++ b/libexec/talkd/table.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef lint
diff --git a/libexec/talkd/talkd.c b/libexec/talkd/talkd.c
index c049230abd1d..acaa8881d3e0 100644
--- a/libexec/talkd/talkd.c
+++ b/libexec/talkd/talkd.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef lint
diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile
index 3343e068e10d..7c9919effb41 100644
--- a/libexec/telnetd/Makefile
+++ b/libexec/telnetd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 12/15/93
-#	$FreeBSD$
+#	$Id$
 
 PROG=	telnetd
 CFLAGS+=-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS
diff --git a/libexec/telnetd/ext.h b/libexec/telnetd/ext.h
index 0344da6afe5f..05898fb5521d 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
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*
diff --git a/libexec/telnetd/pathnames.h b/libexec/telnetd/pathnames.h
index 5c4d45bcf156..979f4d00a4f8 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
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if BSD > 43
diff --git a/libexec/telnetd/slc.c b/libexec/telnetd/slc.c
index 7f914f437967..a3799f3eeb9c 100644
--- a/libexec/telnetd/slc.c
+++ b/libexec/telnetd/slc.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef lint
diff --git a/libexec/telnetd/state.c b/libexec/telnetd/state.c
index 2fd56d2add45..4e72666d7cd5 100644
--- a/libexec/telnetd/state.c
+++ b/libexec/telnetd/state.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef lint
diff --git a/libexec/telnetd/sys_term.c b/libexec/telnetd/sys_term.c
index 301c7482dfba..1881e3239c1c 100644
--- a/libexec/telnetd/sys_term.c
+++ b/libexec/telnetd/sys_term.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef lint
diff --git a/libexec/telnetd/telnetd.8 b/libexec/telnetd/telnetd.8
index 8dd199b92974..cb3c74395e1b 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
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd March 1, 1994
 .Dt TELNETD 8
diff --git a/libexec/telnetd/telnetd.c b/libexec/telnetd/telnetd.c
index d47ca8cb804b..cd32ced73190 100644
--- a/libexec/telnetd/telnetd.c
+++ b/libexec/telnetd/telnetd.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef lint
diff --git a/libexec/telnetd/termstat.c b/libexec/telnetd/termstat.c
index 33947691ea94..9cb2b630b6b7 100644
--- a/libexec/telnetd/termstat.c
+++ b/libexec/telnetd/termstat.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef lint
diff --git a/libexec/telnetd/utility.c b/libexec/telnetd/utility.c
index 3bead277320a..2ee0d217e92c 100644
--- a/libexec/telnetd/utility.c
+++ b/libexec/telnetd/utility.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef lint
diff --git a/libexec/tftpd/Makefile b/libexec/tftpd/Makefile
index 0fc402301a2f..b7c600c41955 100644
--- a/libexec/tftpd/Makefile
+++ b/libexec/tftpd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$FreeBSD$
+#	$Id$
 
 PROG=	tftpd
 SRCS=	tftpd.c tftpsubs.c
diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c
index 26f157be1435..d1f737f0da04 100644
--- a/libexec/tftpd/tftpd.c
+++ b/libexec/tftpd/tftpd.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef lint
diff --git a/libexec/uucpd/Makefile b/libexec/uucpd/Makefile
index 96efb1482956..9a296c99cea1 100644
--- a/libexec/uucpd/Makefile
+++ b/libexec/uucpd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-#	$FreeBSD$
+#	$Id$
 
 PROG=	uucpd
 MAN8=	uucpd.8
diff --git a/libexec/uucpd/pathnames.h b/libexec/uucpd/pathnames.h
index e597a38bdfbf..782f23e87416 100644
--- a/libexec/uucpd/pathnames.h
+++ b/libexec/uucpd/pathnames.h
@@ -32,7 +32,7 @@
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/4/93
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <paths.h>
diff --git a/libexec/uucpd/uucpd.8 b/libexec/uucpd/uucpd.8
index d95b3d2561e8..654f65e01058 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
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd Feb 18, 1996
 .Dt UUCPD 8
diff --git a/libexec/uucpd/uucpd.c b/libexec/uucpd/uucpd.c
index 8366812af788..266831dedd23 100644
--- a/libexec/uucpd/uucpd.c
+++ b/libexec/uucpd/uucpd.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef lint
diff --git a/libexec/xtend/Makefile b/libexec/xtend/Makefile
index 3418457cc3f9..d89e07903ba7 100644
--- a/libexec/xtend/Makefile
+++ b/libexec/xtend/Makefile
@@ -1,5 +1,5 @@
 # Makefile for xtend (Stark) 10/30/93
-# $FreeBSD$
+# $Id$
 
 BINMODE=	555
 
diff --git a/libexec/xtend/packet.c b/libexec/xtend/packet.c
index 63dca526f3fe..ec67c94895e1 100644
--- a/libexec/xtend/packet.c
+++ b/libexec/xtend/packet.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <stdio.h>
diff --git a/libexec/xtend/paths.h b/libexec/xtend/paths.h
index b406ed5adbf2..e41d214ed07f 100644
--- a/libexec/xtend/paths.h
+++ b/libexec/xtend/paths.h
@@ -1,7 +1,7 @@
 /*
  * Pathnames for files used by xtend
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #define X10DIR		"/var/spool/xten"
diff --git a/libexec/xtend/status.c b/libexec/xtend/status.c
index a5ad5426a8f3..e527f55155c6 100644
--- a/libexec/xtend/status.c
+++ b/libexec/xtend/status.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <stdio.h>
diff --git a/libexec/xtend/user.c b/libexec/xtend/user.c
index 360d1dd57075..a795dba1a3e6 100644
--- a/libexec/xtend/user.c
+++ b/libexec/xtend/user.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <stdio.h>
diff --git a/libexec/xtend/xten.h b/libexec/xtend/xten.h
index be34d1316897..23e8c6b266d0 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.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 extern char *X10housenames[];
diff --git a/libexec/xtend/xtend.8 b/libexec/xtend/xtend.8
index 845a548340f2..afa1ecb54861 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.
 .\"
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Th XTEND 8 "30 Oct 1993"
 .Dd Oct 30, 1993
diff --git a/libexec/xtend/xtend.c b/libexec/xtend/xtend.c
index 1519c7efb4ae..dd3212978418 100644
--- a/libexec/xtend/xtend.c
+++ b/libexec/xtend/xtend.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *	
- * 	$FreeBSD$
+ * 	$Id$
  */
 
 /*
diff --git a/libexec/xtend/xtend.h b/libexec/xtend/xtend.h
index afc885eaaff3..9d704449cf69 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.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*
diff --git a/libexec/ypxfr/Makefile b/libexec/ypxfr/Makefile
index ceed7ee574da..61a59c7c96c4 100644
--- a/libexec/ypxfr/Makefile
+++ b/libexec/ypxfr/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
 
 PROG=	ypxfr
 SRCS=	ypxfr_clnt.c yp_clnt.c ypxfr_getmap.c yp_dblookup.c \
diff --git a/libexec/ypxfr/yp_dbwrite.c b/libexec/ypxfr/yp_dbwrite.c
index 950df13f2c50..e5ad7fd89fb1 100644
--- a/libexec/ypxfr/yp_dbwrite.c
+++ b/libexec/ypxfr/yp_dbwrite.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  *
  */
 #include <stdio.h>
@@ -46,7 +46,7 @@
 #include "ypxfr_extern.h"
 
 #ifndef lint
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$Id$";
 #endif
 
 #define PERM_SECURE (S_IRUSR|S_IWUSR)
diff --git a/libexec/ypxfr/ypxfr.8 b/libexec/ypxfr/ypxfr.8
index f0aef07b6c1f..3dd4a0fa6794 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.
 .\"
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd February 5, 1995
 .Dt YPXFR 8
diff --git a/libexec/ypxfr/ypxfr_extern.h b/libexec/ypxfr/ypxfr_extern.h
index 1d530c14a86c..5ca370c874cb 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.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 #include <sys/types.h>
 #include <limits.h>
diff --git a/libexec/ypxfr/ypxfr_getmap.c b/libexec/ypxfr/ypxfr_getmap.c
index 2a5834d91ee4..14939aee380c 100644
--- a/libexec/ypxfr/ypxfr_getmap.c
+++ b/libexec/ypxfr/ypxfr_getmap.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 #include <stdio.h>
 #include <sys/types.h>
@@ -40,7 +40,7 @@
 #include "ypxfr_extern.h"
 
 #ifndef lint
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$Id$";
 #endif
 
 extern bool_t xdr_ypresp_all_seq __P(( XDR *, unsigned long * ));
diff --git a/libexec/ypxfr/ypxfr_main.c b/libexec/ypxfr/ypxfr_main.c
index 5068b8fe5fb3..63e4b4935ec8 100644
--- a/libexec/ypxfr/ypxfr_main.c
+++ b/libexec/ypxfr/ypxfr_main.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 #include <stdio.h>
 #include <stdlib.h>
@@ -51,7 +51,7 @@ struct dom_binding {};
 #include "ypxfr_extern.h"
 
 #ifndef lint
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$Id$";
 #endif
 
 char *progname = "ypxfr";
diff --git a/libexec/ypxfr/ypxfr_misc.c b/libexec/ypxfr/ypxfr_misc.c
index ad484e2e8883..aaaff6765ba3 100644
--- a/libexec/ypxfr/ypxfr_misc.c
+++ b/libexec/ypxfr/ypxfr_misc.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 #include <stdio.h>
 #include <string.h>
@@ -43,7 +43,7 @@ struct dom_binding {};
 #include "ypxfr_extern.h"
 
 #ifndef lint
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$Id$";
 #endif
 
 char *ypxfrerr_string(code)
diff --git a/libexec/ypxfr/ypxfrd_getmap.c b/libexec/ypxfr/ypxfrd_getmap.c
index 05e218e19906..3844beb54136 100644
--- a/libexec/ypxfr/ypxfrd_getmap.c
+++ b/libexec/ypxfr/ypxfrd_getmap.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <stdlib.h>
@@ -47,7 +47,7 @@
 #include "ypxfr_extern.h"
 
 #ifndef lint
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$Id$";
 #endif
 
 int fp = 0;