diff --git a/eBones/Copyright.MIT b/eBones/Copyright.MIT
index 4ae9bb751c3..773c2486a7d 100644
--- a/eBones/Copyright.MIT
+++ b/eBones/Copyright.MIT
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 The following Copyright notice applies to the original Bones package.
 
diff --git a/eBones/Copyright.SIPB b/eBones/Copyright.SIPB
index 10801843acb..9993d619bc9 100644
--- a/eBones/Copyright.SIPB
+++ b/eBones/Copyright.SIPB
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 The following Copyright notice applies to parts of the Bones package.
 See source code for exact references.
diff --git a/eBones/Makefile b/eBones/Makefile
index 82d67c21c8b..1f7273a05c6 100644
--- a/eBones/Makefile
+++ b/eBones/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$FreeBSD$
+#	$Id$
 
 SUBDIR=	include lib libexec usr.bin usr.sbin man
 
diff --git a/eBones/Makefile.inc b/eBones/Makefile.inc
index 4bc753ed47b..6b7bfed316d 100644
--- a/eBones/Makefile.inc
+++ b/eBones/Makefile.inc
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile.inc	5.1 (Berkeley) 6/25/90
-#	$FreeBSD$
+#	$Id$
 
 DISTRIBUTION=	krb
 
diff --git a/eBones/include/ChangeLog b/eBones/include/ChangeLog
index cbe5a62c9d7..c925a5b852f 100644
--- a/eBones/include/ChangeLog
+++ b/eBones/include/ChangeLog
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 Mon Mar 21 15:48:59 MET 1994	Piero Serini
 	* 1st port to FreeBSD
diff --git a/eBones/include/Makefile b/eBones/include/Makefile
index bf343b0b021..4269b319200 100644
--- a/eBones/include/Makefile
+++ b/eBones/include/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$FreeBSD$
+#	$Id$
 
 FILES=	kparse.h krb.h krb_db.h
 
diff --git a/eBones/include/addr_comp.h b/eBones/include/addr_comp.h
index 1e453a50824..1ef2d757e8b 100644
--- a/eBones/include/addr_comp.h
+++ b/eBones/include/addr_comp.h
@@ -6,7 +6,7 @@
  * Include file for address comparison macros.
  *
  *	from: addr_comp.h,v 4.0 89/01/23 09:57:44 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef ADDR_COMP_DEFS
diff --git a/eBones/include/admin_server.h b/eBones/include/admin_server.h
index 5d8c77807fd..d7f76ba2920 100644
--- a/eBones/include/admin_server.h
+++ b/eBones/include/admin_server.h
@@ -6,7 +6,7 @@
  * Include file for the Kerberos administration server.
  *
  *	from: admin_server.h,v 4.7 89/01/11 11:59:42 steiner Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef ADMIN_SERVER_DEFS
diff --git a/eBones/include/conf-bsd386i.h b/eBones/include/conf-bsd386i.h
index b0e157d5791..155a31bcac1 100644
--- a/eBones/include/conf-bsd386i.h
+++ b/eBones/include/conf-bsd386i.h
@@ -6,7 +6,7 @@
  * Machine-type definitions: Sun 386i using SunOS (~BSD)
  *
  *	from: conf-bsd386i.h,v 4.0 89/12/19 13:26:55 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #define BITS32
diff --git a/eBones/include/conf-bsdapollo.h b/eBones/include/conf-bsdapollo.h
index 1543660070e..c427c0ee25d 100644
--- a/eBones/include/conf-bsdapollo.h
+++ b/eBones/include/conf-bsdapollo.h
@@ -4,7 +4,7 @@
  * <Copyright.MIT>.
  *
  *	from: conf-bsdapollo.h,v 4.1 89/01/24 14:26:22 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #define BSDUNIX
diff --git a/eBones/include/conf-bsdibm032.h b/eBones/include/conf-bsdibm032.h
index 7189552bbf9..5c84f072835 100644
--- a/eBones/include/conf-bsdibm032.h
+++ b/eBones/include/conf-bsdibm032.h
@@ -6,7 +6,7 @@
  * Machine-type definitions: IBM 032 (RT/PC)
  *
  *	from: conf-bsdibm032.h,v 4.0 89/01/23 09:58:01 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #define BSDUNIX
diff --git a/eBones/include/conf-bsdm68k.h b/eBones/include/conf-bsdm68k.h
index b9aa39c557e..36a9fe8f50b 100644
--- a/eBones/include/conf-bsdm68k.h
+++ b/eBones/include/conf-bsdm68k.h
@@ -6,7 +6,7 @@
  * Machine-type definitions: 68000 with BSD Unix, e.g. SUN
  *
  *	from: conf-bsdm68k.h,v 4.0 88/11/29 11:46:58 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #define BITS32
diff --git a/eBones/include/conf-bsdsparc.h b/eBones/include/conf-bsdsparc.h
index 3c0f342843a..1c846ffb0dc 100644
--- a/eBones/include/conf-bsdsparc.h
+++ b/eBones/include/conf-bsdsparc.h
@@ -6,7 +6,7 @@
  * Machine-type definitions: SPARC with BSD Unix, e.g. SUN-4
  *
  *	from: conf-bsdsparc.h,v 4.0 89/06/02 13:04:06 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #define BITS32
diff --git a/eBones/include/conf-bsdtahoe.h b/eBones/include/conf-bsdtahoe.h
index fef2aeb778e..c91b3d049bf 100644
--- a/eBones/include/conf-bsdtahoe.h
+++ b/eBones/include/conf-bsdtahoe.h
@@ -4,7 +4,7 @@
  * Machine Description : TAHOE.
  *
  *	from: conf-bsdtahoe.h,v 4.0 89/08/30 11:06:53 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #define	TAHOE
diff --git a/eBones/include/conf-bsdvax.h b/eBones/include/conf-bsdvax.h
index de1bf2b98de..09433ced9cb 100644
--- a/eBones/include/conf-bsdvax.h
+++ b/eBones/include/conf-bsdvax.h
@@ -6,7 +6,7 @@
  * Machine-type definitions: VAX
  *
  *	from: conf-bsdvax.h,v 4.0 89/01/23 09:58:12 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #define VAX
diff --git a/eBones/include/conf-ibm370.h b/eBones/include/conf-ibm370.h
index 35c8f73fd49..80d87a1ab66 100644
--- a/eBones/include/conf-ibm370.h
+++ b/eBones/include/conf-ibm370.h
@@ -6,7 +6,7 @@
  * Machine-type definitions: IBM 370
  *
  *	from: conf-ibm370.h,v 4.0 89/01/23 09:58:19 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 /* What else? */
diff --git a/eBones/include/conf-pc.h b/eBones/include/conf-pc.h
index 4d272c2f5da..d56e5a95152 100644
--- a/eBones/include/conf-pc.h
+++ b/eBones/include/conf-pc.h
@@ -6,7 +6,7 @@
  * Machine-type definitions: IBM PC 8086
  *
  *	from: conf-pc.h,v 4.0 89/01/23 09:58:26 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  *
  */
 
diff --git a/eBones/include/conf-pyr.h b/eBones/include/conf-pyr.h
index 96f5bca36cb..b1d3add3ed2 100644
--- a/eBones/include/conf-pyr.h
+++ b/eBones/include/conf-pyr.h
@@ -6,7 +6,7 @@
  * Machine-type definitions: Pyramid
  *
  *	from: conf-pyr.h,v 4.0 89/12/19 13:27:16 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #define BITS32
diff --git a/eBones/include/conf-ultmips2.h b/eBones/include/conf-ultmips2.h
index fee76ad290b..ee50d90474e 100644
--- a/eBones/include/conf-ultmips2.h
+++ b/eBones/include/conf-ultmips2.h
@@ -6,7 +6,7 @@
  * Machine-type definitions: DECstation 3100 (MIPS R2000)
  *
  *	from: conf-ultmips2.h,v 4.0 89/01/23 09:58:32 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #define MIPS2
diff --git a/eBones/include/conf.h b/eBones/include/conf.h
index d967f4a9641..3427e5cabae 100644
--- a/eBones/include/conf.h
+++ b/eBones/include/conf.h
@@ -12,7 +12,7 @@
  * /usr/include/krb.h?)
  *
  *	from: conf.h,v 4.0 89/01/23 09:58:40 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _CONF_H_
diff --git a/eBones/include/highc.h b/eBones/include/highc.h
index c681f35f27f..e480d1c40b9 100644
--- a/eBones/include/highc.h
+++ b/eBones/include/highc.h
@@ -7,7 +7,7 @@
  * we've got available....
  *
  *	from: highc.h,v 4.0 89/01/23 09:59:15 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #define const
diff --git a/eBones/include/kdc.h b/eBones/include/kdc.h
index 2da84288307..7950fff49b9 100644
--- a/eBones/include/kdc.h
+++ b/eBones/include/kdc.h
@@ -6,7 +6,7 @@
  * Include file for the Kerberos Key Distribution Center.
  *
  *	from: kdc.h,v 4.1 89/01/24 17:54:04 jon Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef KDC_DEFS
diff --git a/eBones/include/klog.h b/eBones/include/klog.h
index 7a5c389e13c..dd1fe65faae 100644
--- a/eBones/include/klog.h
+++ b/eBones/include/klog.h
@@ -7,7 +7,7 @@
  * type of message may be selectively turned on or off.
  *
  *	from: klog.h,v 4.7 89/01/24 17:55:07 jon Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef KLOG_DEFS
diff --git a/eBones/include/kparse.h b/eBones/include/kparse.h
index 662a7521e98..077aa59e3a4 100644
--- a/eBones/include/kparse.h
+++ b/eBones/include/kparse.h
@@ -6,7 +6,7 @@
  * Include file for kparse routines.
  *
  *	from: kparse.h,v 4.5 89/01/11 12:05:53 steiner Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef KPARSE_DEFS
diff --git a/eBones/include/krb.h b/eBones/include/krb.h
index d1f23898868..63ce3291fe1 100644
--- a/eBones/include/krb.h
+++ b/eBones/include/krb.h
@@ -6,7 +6,7 @@
  * Include file for the Kerberos library.
  *
  *	from: krb.h,v 4.26 89/08/08 17:55:25 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 /* Only one time, please */
diff --git a/eBones/include/krb_conf.h b/eBones/include/krb_conf.h
index 2f22d07387c..0ae23e1dab3 100644
--- a/eBones/include/krb_conf.h
+++ b/eBones/include/krb_conf.h
@@ -14,7 +14,7 @@
  * sources.
  *
  *	from: krb_conf.h,v 4.0 89/01/23 09:59:27 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef KRB_CONF_DEFS
diff --git a/eBones/include/krb_db.h b/eBones/include/krb_db.h
index 2e310880f14..84da43d3236 100644
--- a/eBones/include/krb_db.h
+++ b/eBones/include/krb_db.h
@@ -11,7 +11,7 @@
  * They MUST correspond to those defined in *.rel
  *
  *	from: krb_db.h,v 4.9 89/01/24 17:55:39 jon Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef KRB_DB_DEFS
diff --git a/eBones/include/lsb_addr_comp.h b/eBones/include/lsb_addr_comp.h
index 4aaf52115df..63e0923bf46 100644
--- a/eBones/include/lsb_addr_comp.h
+++ b/eBones/include/lsb_addr_comp.h
@@ -7,7 +7,7 @@
  * byte-order quantities
  *
  *	from: lsb_addr_comp.h,v 4.0 89/01/23 15:44:46 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef LSB_ADDR_COMP_DEFS
diff --git a/eBones/include/osconf.h b/eBones/include/osconf.h
index 4de067f4403..23bc76d7d81 100644
--- a/eBones/include/osconf.h
+++ b/eBones/include/osconf.h
@@ -6,7 +6,7 @@
  * Athena configuration.
  *
  *	from: osconf.h,v 4.4 89/12/19 13:26:27 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifdef tahoe
diff --git a/eBones/include/passwd_server.h b/eBones/include/passwd_server.h
index fe08969f0e7..155a1729864 100644
--- a/eBones/include/passwd_server.h
+++ b/eBones/include/passwd_server.h
@@ -6,7 +6,7 @@
  * Include file for password server
  *
  *	from: passwd_server.h,v 4.6 89/01/11 15:12:22 steiner Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef PASSWD_SERVER_DEFS
diff --git a/eBones/include/principal.h b/eBones/include/principal.h
index e7d452690c6..7cac5257b82 100644
--- a/eBones/include/principal.h
+++ b/eBones/include/principal.h
@@ -6,7 +6,7 @@
  * Definitions for principal names.
  *
  *	from: principal.h,v 4.5 89/01/11 15:15:01 steiner Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef PRINCIPAL_DEFS
diff --git a/eBones/include/prot.h b/eBones/include/prot.h
index 60f2b55078b..e9c41cf66f7 100644
--- a/eBones/include/prot.h
+++ b/eBones/include/prot.h
@@ -7,7 +7,7 @@
  * Include file with authentication protocol information.
  *
  *	from: prot.h,v 4.13 89/01/24 14:27:22 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #include <krb_conf.h>
diff --git a/eBones/include/rkinit.h b/eBones/include/rkinit.h
index 46a9b9d3f40..faf1435b031 100644
--- a/eBones/include/rkinit.h
+++ b/eBones/include/rkinit.h
@@ -1,7 +1,7 @@
 /* 
- * $FreeBSD$
+ * $Id$
  * $Source: /home/ncvs/src/eBones/include/rkinit.h,v $
- * $Author: gibbs $
+ * $Author: jkh $
  *
  * Main header file for rkinit library users
  */
@@ -10,7 +10,7 @@
 #define __RKINIT_H__
 
 #if !defined(lint) && !defined(SABER) && !defined(LOCORE) && defined(RCS_HDRS)
-static char *rcsid_rkinit_h = "$FreeBSD$";
+static char *rcsid_rkinit_h = "$Id$";
 #endif /* lint || SABER || LOCORE || RCS_HDRS */
 
 #include <krb.h>
diff --git a/eBones/include/rkinit_private.h b/eBones/include/rkinit_private.h
index 3257d776e35..ec025097ff4 100644
--- a/eBones/include/rkinit_private.h
+++ b/eBones/include/rkinit_private.h
@@ -1,5 +1,5 @@
 /* 
- * $FreeBSD$
+ * $Id$
  *
  * Header file for rkinit library and server internal use
  */
diff --git a/eBones/lib/Makefile b/eBones/lib/Makefile
index 96e581de460..206bcaacfcf 100644
--- a/eBones/lib/Makefile
+++ b/eBones/lib/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$FreeBSD$
+#	$Id$
 
 SUBDIR=	libacl libkdb libkrb libkadm librkinit
 
diff --git a/eBones/lib/libacl/Makefile b/eBones/lib/libacl/Makefile
index 3c225304188..927db0259a4 100644
--- a/eBones/lib/libacl/Makefile
+++ b/eBones/lib/libacl/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$FreeBSD$
+#	$Id$
 
 LIB=	acl
 CFLAGS+=-DDEBUG -DKERBEROS
diff --git a/eBones/lib/libacl/acl_check.3 b/eBones/lib/libacl/acl_check.3
index bca625002c4..6cb2eee1471 100644
--- a/eBones/lib/libacl/acl_check.3
+++ b/eBones/lib/libacl/acl_check.3
@@ -1,5 +1,5 @@
 .\" from: acl_check.3,v 4.1 89/01/23 11:06:54 jtkohl Exp $
-.\" $FreeBSD$
+.\" $Id$
 .\" Copyright 1989 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
diff --git a/eBones/lib/libacl/acl_files.c b/eBones/lib/libacl/acl_files.c
index a75a965cad0..c5fe861f402 100644
--- a/eBones/lib/libacl/acl_files.c
+++ b/eBones/lib/libacl/acl_files.c
@@ -6,13 +6,13 @@
  * <mit-copyright.h>.
  *
  *	from: acl_files.c,v 4.4 89/12/19 13:30:53 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif lint
 #endif
 
diff --git a/eBones/lib/libkadm/Makefile b/eBones/lib/libkadm/Makefile
index 587f9876bdd..63db35454ed 100644
--- a/eBones/lib/libkadm/Makefile
+++ b/eBones/lib/libkadm/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$FreeBSD$
+#	$Id$
 
 LIB=	kadm
 
diff --git a/eBones/lib/libkadm/kadm_cli_wrap.c b/eBones/lib/libkadm/kadm_cli_wrap.c
index 26992e2c3a1..9ca0bdff0f5 100644
--- a/eBones/lib/libkadm/kadm_cli_wrap.c
+++ b/eBones/lib/libkadm/kadm_cli_wrap.c
@@ -12,7 +12,7 @@
 static char rcsid_kadm_cli_wrap_c[] =
 "from: Id: kadm_cli_wrap.c,v 4.6 89/12/30 20:09:45 qjb Exp";
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/lib/libkadm/kadm_stream.c b/eBones/lib/libkadm/kadm_stream.c
index c71497517f3..8bec7d7c701 100644
--- a/eBones/lib/libkadm/kadm_stream.c
+++ b/eBones/lib/libkadm/kadm_stream.c
@@ -12,7 +12,7 @@
 static char rcsid_kadm_stream_c[] =
 "Header: /afs/athena.mit.edu/astaff/project/kerberos/src/lib/kadm/RCS/kadm_stream.c,v 4.2 89/09/26 09:20:48 jtkohl Exp ";
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/lib/libkadm/kadm_supp.c b/eBones/lib/libkadm/kadm_supp.c
index ca516a092cd..cf8bba5202e 100644
--- a/eBones/lib/libkadm/kadm_supp.c
+++ b/eBones/lib/libkadm/kadm_supp.c
@@ -12,7 +12,7 @@
 static char rcsid_kadm_supp_c[] =
 "Header: /afs/athena.mit.edu/astaff/project/kerberos/src/lib/kadm/RCS/kadm_supp.c,v 4.1 89/09/26 09:21:07 jtkohl Exp ";
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/lib/libkdb/Makefile b/eBones/lib/libkdb/Makefile
index 07c61f4fec4..88041ccd4ad 100644
--- a/eBones/lib/libkdb/Makefile
+++ b/eBones/lib/libkdb/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$FreeBSD$
+#	$Id$
 
 LIB=	kdb
 CFLAGS+=-DKERBEROS -DDEBUG
diff --git a/eBones/lib/libkdb/krb_cache.c b/eBones/lib/libkdb/krb_cache.c
index a45ea90e119..2e8ad118f53 100644
--- a/eBones/lib/libkdb/krb_cache.c
+++ b/eBones/lib/libkdb/krb_cache.c
@@ -6,13 +6,13 @@
  * This is where a cache would be implemented, if it were necessary.
  *
  *	from: krb_cache.c,v 4.5 89/01/24 18:12:34 jon Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef	lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/lib/libkdb/krb_dbm.c b/eBones/lib/libkdb/krb_dbm.c
index ac635a25900..9b100c5f868 100644
--- a/eBones/lib/libkdb/krb_dbm.c
+++ b/eBones/lib/libkdb/krb_dbm.c
@@ -4,13 +4,13 @@
  * <Copyright.MIT>.
  *
  *	from: krb_dbm.c,v 4.9 89/04/18 16:15:13 wesommer Exp $
- *	$FreeBSD$
+ *	$Id$
 */
   
 #if 0
 #ifndef	lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/lib/libkdb/krb_kdb_utils.c b/eBones/lib/libkdb/krb_kdb_utils.c
index 1f52cc614c8..abec4797efd 100644
--- a/eBones/lib/libkdb/krb_kdb_utils.c
+++ b/eBones/lib/libkdb/krb_kdb_utils.c
@@ -10,13 +10,13 @@
  * Jon Rochlis, MIT Telecom, March 1988
  *
  *	from: krb_kdb_utils.c,v 4.1 89/07/26 11:01:12 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef	lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/lib/libkdb/krb_lib.c b/eBones/lib/libkdb/krb_lib.c
index c23c58b7a21..235c050e7c7 100644
--- a/eBones/lib/libkdb/krb_lib.c
+++ b/eBones/lib/libkdb/krb_lib.c
@@ -1,6 +1,6 @@
 /*
  * $Source: /home/ncvs/src/eBones/lib/libkdb/krb_lib.c,v $
- * $Author: markm $
+ * $Author: jkh $
  *
  * Copyright 1988 by the Massachusetts Institute of Technology.
  *
@@ -11,7 +11,7 @@
 #if 0
 #ifndef	lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/lib/libkdb/print_princ.c b/eBones/lib/libkdb/print_princ.c
index 75b8f30b32a..396a66aaa4e 100644
--- a/eBones/lib/libkdb/print_princ.c
+++ b/eBones/lib/libkdb/print_princ.c
@@ -3,14 +3,14 @@
  * For copying and distribution information, please see the file
  * <Copyright.MIT>.
  *
- *	from: $Header: /home/ncvs/src/eBones/lib/libkdb/print_princ.c,v 1.4 1995/09/07 21:37:13 markm Exp $
- *	$FreeBSD$
+ *	from: $Header: /home/ncvs/src/eBones/lib/libkdb/print_princ.c,v 1.5 1997/01/14 05:40:32 jkh Exp $
+ *	$Id$
  */
 
 #if 0
 #ifndef	lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/lib/libkrb/Makefile b/eBones/lib/libkrb/Makefile
index 0c622b6257d..4bd9eee6163 100644
--- a/eBones/lib/libkrb/Makefile
+++ b/eBones/lib/libkrb/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$FreeBSD$
+#	$Id$
 
 LIB=	krb
 SHLIB_MINOR=   1
diff --git a/eBones/lib/libkrb/add_ticket.c b/eBones/lib/libkrb/add_ticket.c
index b28ed4d5eab..e9840b6ce41 100644
--- a/eBones/lib/libkrb/add_ticket.c
+++ b/eBones/lib/libkrb/add_ticket.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: add_ticket.c,v 4.7 88/10/07 06:06:26 shanzer Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/create_auth_reply.c b/eBones/lib/libkrb/create_auth_reply.c
index e70d74f6832..e7f669b239f 100644
--- a/eBones/lib/libkrb/create_auth_reply.c
+++ b/eBones/lib/libkrb/create_auth_reply.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: create_auth_reply.c,v 4.10 89/01/13 17:47:38 steiner Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char *rcsid =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/create_ciph.c b/eBones/lib/libkrb/create_ciph.c
index d94716ed961..c0e56564329 100644
--- a/eBones/lib/libkrb/create_ciph.c
+++ b/eBones/lib/libkrb/create_ciph.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: create_ciph.c,v 4.8 89/05/18 21:24:26 jis Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char *rcsid =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/create_death_packet.c b/eBones/lib/libkrb/create_death_packet.c
index 1d791021b03..46decc11154 100644
--- a/eBones/lib/libkrb/create_death_packet.c
+++ b/eBones/lib/libkrb/create_death_packet.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: create_death_packet.c,v 4.9 89/01/17 16:05:59 rfrench Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char *rcsid =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/create_ticket.c b/eBones/lib/libkrb/create_ticket.c
index eca838e1b5f..ff9a09ba3c6 100644
--- a/eBones/lib/libkrb/create_ticket.c
+++ b/eBones/lib/libkrb/create_ticket.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: create_ticket.c,v 4.11 89/03/22 14:43:23 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/debug_decl.c b/eBones/lib/libkrb/debug_decl.c
index 128dd074108..f39aa61e813 100644
--- a/eBones/lib/libkrb/debug_decl.c
+++ b/eBones/lib/libkrb/debug_decl.c
@@ -4,13 +4,13 @@
  * <Copyright.MIT>.
  *
  *	from: debug_decl.c,v 4.5 88/10/07 06:07:49 shanzer Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef	lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/lib/libkrb/decomp_ticket.c b/eBones/lib/libkrb/decomp_ticket.c
index b3b3cadbd5e..cb304dff5b7 100644
--- a/eBones/lib/libkrb/decomp_ticket.c
+++ b/eBones/lib/libkrb/decomp_ticket.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: decomp_ticket.c,v 4.12 89/05/16 18:44:46 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char *rcsid =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/des_rw.c b/eBones/lib/libkrb/des_rw.c
index e115c74dda0..e2ac1834944 100644
--- a/eBones/lib/libkrb/des_rw.c
+++ b/eBones/lib/libkrb/des_rw.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $Id$
  */
 
 /*
diff --git a/eBones/lib/libkrb/dest_tkt.c b/eBones/lib/libkrb/dest_tkt.c
index 2c45dc212cc..c91d8819359 100644
--- a/eBones/lib/libkrb/dest_tkt.c
+++ b/eBones/lib/libkrb/dest_tkt.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: dest_tkt.c,v 4.9 89/10/02 16:23:07 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char *rcsid =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/extract_ticket.c b/eBones/lib/libkrb/extract_ticket.c
index 840da29266b..eb9e3b0590d 100644
--- a/eBones/lib/libkrb/extract_ticket.c
+++ b/eBones/lib/libkrb/extract_ticket.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: extract_ticket.c,v 4.6 88/10/07 06:08:15 shanzer Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char *rcsid =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/fgetst.c b/eBones/lib/libkrb/fgetst.c
index f053e5b9fd9..459b5f4fcf8 100644
--- a/eBones/lib/libkrb/fgetst.c
+++ b/eBones/lib/libkrb/fgetst.c
@@ -4,13 +4,13 @@
  * <Copyright.MIT>.
  *
  *	from: fgetst.c,v 4.0 89/01/23 10:08:31 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif	/* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/get_ad_tkt.c b/eBones/lib/libkrb/get_ad_tkt.c
index 0d109ca10f4..4ab5e675172 100644
--- a/eBones/lib/libkrb/get_ad_tkt.c
+++ b/eBones/lib/libkrb/get_ad_tkt.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: get_ad_tkt.c,v 4.15 89/07/07 15:18:51 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/get_admhst.c b/eBones/lib/libkrb/get_admhst.c
index 1e3be22042c..2f84f3cd43f 100644
--- a/eBones/lib/libkrb/get_admhst.c
+++ b/eBones/lib/libkrb/get_admhst.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: get_admhst.c,v 4.0 89/01/23 10:08:55 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char *rcsid =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/get_cred.c b/eBones/lib/libkrb/get_cred.c
index 452663f67d7..ef0bf74359b 100644
--- a/eBones/lib/libkrb/get_cred.c
+++ b/eBones/lib/libkrb/get_cred.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: get_cred.c,v 4.10 89/05/31 17:46:22 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char *rcsid =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/get_in_tkt.c b/eBones/lib/libkrb/get_in_tkt.c
index 61839eba312..9cc577988fb 100644
--- a/eBones/lib/libkrb/get_in_tkt.c
+++ b/eBones/lib/libkrb/get_in_tkt.c
@@ -4,13 +4,13 @@
  * <Copyright.MIT>.
  *
  *	from: get_in_tkt.c,v 4.12 89/07/18 16:32:56 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
@@ -90,7 +90,7 @@ krb_get_pw_in_tkt(user,instance,realm,service,sinstance,life,password)
 #ifdef NOENCRYPTION
 /*
  * $Source: /home/ncvs/src/eBones/lib/libkrb/get_in_tkt.c,v $
- * $Author: markm $
+ * $Author: jkh $
  *
  * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute
  * of Technology.
diff --git a/eBones/lib/libkrb/get_krbhst.c b/eBones/lib/libkrb/get_krbhst.c
index 7ba4c367522..30ecdbf83a6 100644
--- a/eBones/lib/libkrb/get_krbhst.c
+++ b/eBones/lib/libkrb/get_krbhst.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: get_krbhst.c,v 4.8 89/01/22 20:00:29 rfrench Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char *rcsid =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/get_krbrlm.c b/eBones/lib/libkrb/get_krbrlm.c
index 682b61dc3e2..dceb49a6c48 100644
--- a/eBones/lib/libkrb/get_krbrlm.c
+++ b/eBones/lib/libkrb/get_krbrlm.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: get_krbrlm.c,v 4.8 89/01/22 20:02:54 rfrench Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char *rcsid =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/get_phost.c b/eBones/lib/libkrb/get_phost.c
index 9088649330b..8d3ee489776 100644
--- a/eBones/lib/libkrb/get_phost.c
+++ b/eBones/lib/libkrb/get_phost.c
@@ -4,13 +4,13 @@
  * <Copyright.MIT>.
  *
  *	from: get_phost.c,v 4.6 89/01/23 09:25:40 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/get_pw_tkt.c b/eBones/lib/libkrb/get_pw_tkt.c
index 79ebc15bbcb..66661d1eee1 100644
--- a/eBones/lib/libkrb/get_pw_tkt.c
+++ b/eBones/lib/libkrb/get_pw_tkt.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: get_pw_tkt.c,v 4.6 89/01/13 18:19:11 steiner Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char *rcsid =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/get_request.c b/eBones/lib/libkrb/get_request.c
index ce74c60302a..c9d32b2227c 100644
--- a/eBones/lib/libkrb/get_request.c
+++ b/eBones/lib/libkrb/get_request.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: get_request.c,v 4.7 88/12/01 14:00:11 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char *rcsid =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/get_svc_in_tkt.c b/eBones/lib/libkrb/get_svc_in_tkt.c
index 3771e76ee29..fdc50ca42a3 100644
--- a/eBones/lib/libkrb/get_svc_in_tkt.c
+++ b/eBones/lib/libkrb/get_svc_in_tkt.c
@@ -4,13 +4,13 @@
  * <Copyright.MIT>.
  *
  *	from: get_svc_in_tkt.c,v 4.9 89/07/18 16:33:34 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/get_tf_fullname.c b/eBones/lib/libkrb/get_tf_fullname.c
index 42041b87762..6db4ae221cd 100644
--- a/eBones/lib/libkrb/get_tf_fullname.c
+++ b/eBones/lib/libkrb/get_tf_fullname.c
@@ -4,13 +4,13 @@
  * <Copyright.MIT>.
  *
  *	from: get_tf_fullname.c,v 4.3 90/03/10 22:40:20 jon Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/get_tf_realm.c b/eBones/lib/libkrb/get_tf_realm.c
index de91412a290..35c06072ab8 100644
--- a/eBones/lib/libkrb/get_tf_realm.c
+++ b/eBones/lib/libkrb/get_tf_realm.c
@@ -4,13 +4,13 @@
  * <Copyright.MIT>.
  *
  *	from: get_tf_realm.c,v 4.2 90/01/02 13:40:19 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/getrealm.c b/eBones/lib/libkrb/getrealm.c
index 4060035daa1..945ddfd02d5 100644
--- a/eBones/lib/libkrb/getrealm.c
+++ b/eBones/lib/libkrb/getrealm.c
@@ -6,13 +6,13 @@
  * routine to convert hostname into realm name.
  *
  *	from: getrealm.c,v 4.6 90/01/02 13:35:56 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef	lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/lib/libkrb/getst.c b/eBones/lib/libkrb/getst.c
index 00348389c04..e0462579252 100644
--- a/eBones/lib/libkrb/getst.c
+++ b/eBones/lib/libkrb/getst.c
@@ -4,13 +4,13 @@
  * <Copyright.MIT>.
  *
  *	form: getst.c,v 4.5 88/11/15 16:31:39 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/in_tkt.c b/eBones/lib/libkrb/in_tkt.c
index a70945c89c4..faa97032a9a 100644
--- a/eBones/lib/libkrb/in_tkt.c
+++ b/eBones/lib/libkrb/in_tkt.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: kt.c,v 4.9 89/10/25 19:03:35 qjb Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/k_gethostname.c b/eBones/lib/libkrb/k_gethostname.c
index 00a4cacb302..f1df2cf4756 100644
--- a/eBones/lib/libkrb/k_gethostname.c
+++ b/eBones/lib/libkrb/k_gethostname.c
@@ -4,13 +4,13 @@
  * <Copyright.MIT>.
  *
  *	from: k_gethostname.c,v 4.1 88/12/01 14:04:42 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/klog.c b/eBones/lib/libkrb/klog.c
index b2b4929e3b9..3f9f3e0a749 100644
--- a/eBones/lib/libkrb/klog.c
+++ b/eBones/lib/libkrb/klog.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: klog.c,v 4.6 88/12/01 14:06:05 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char *rcsid =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/kname_parse.c b/eBones/lib/libkrb/kname_parse.c
index 7a3f6024b8e..3eb65bac68a 100644
--- a/eBones/lib/libkrb/kname_parse.c
+++ b/eBones/lib/libkrb/kname_parse.c
@@ -4,13 +4,13 @@
  * <Copyright.MIT>.
  *
  *	from: kname_parse.c,v 4.4 88/12/01 14:07:29 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/kntoln.c b/eBones/lib/libkrb/kntoln.c
index 987fd7c4af1..d397cd94e47 100644
--- a/eBones/lib/libkrb/kntoln.c
+++ b/eBones/lib/libkrb/kntoln.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: kntoln.c,v 4.7 89/01/23 09:25:15 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char *rcsid =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/kparse.c b/eBones/lib/libkrb/kparse.c
index 87fa64a9356..720bc8949ed 100644
--- a/eBones/lib/libkrb/kparse.c
+++ b/eBones/lib/libkrb/kparse.c
@@ -30,13 +30,13 @@
  *
  *
  *	from: kparse.c,v 4.5 89/01/21 17:20:39 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef	lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/lib/libkrb/krb_err.et b/eBones/lib/libkrb/krb_err.et
index 1d5d5f5f762..8fedf9fe949 100644
--- a/eBones/lib/libkrb/krb_err.et
+++ b/eBones/lib/libkrb/krb_err.et
@@ -3,7 +3,7 @@
 #	"Copyright.MIT".
 #
 #	from: krb_err.et,v 4.1 89/09/26 09:24:20 jtkohl Exp $
-#	$FreeBSD$
+#	$Id$
 #
 	error_table	krb
 
diff --git a/eBones/lib/libkrb/krb_err_txt.c b/eBones/lib/libkrb/krb_err_txt.c
index fd1ae2d5b7d..ebe6fa4ba6a 100644
--- a/eBones/lib/libkrb/krb_err_txt.c
+++ b/eBones/lib/libkrb/krb_err_txt.c
@@ -4,13 +4,13 @@
  * <Copyright.MIT>.
  *
  *	from: krb_err_txt.c,v 4.7 88/12/01 14:10:14 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef	lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/lib/libkrb/krb_get_in_tkt.c b/eBones/lib/libkrb/krb_get_in_tkt.c
index 06e2e3a7591..016f35b4e46 100644
--- a/eBones/lib/libkrb/krb_get_in_tkt.c
+++ b/eBones/lib/libkrb/krb_get_in_tkt.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: der: krb_get_in_tkt.c,v 4.19 89/07/18 16:31:31 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char *rcsid =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/krb_realmofhost.3 b/eBones/lib/libkrb/krb_realmofhost.3
index a1688678fd6..f710bbfbc7c 100644
--- a/eBones/lib/libkrb/krb_realmofhost.3
+++ b/eBones/lib/libkrb/krb_realmofhost.3
@@ -1,5 +1,5 @@
 .\" from: krb_realmofhost.3,v 4.1 89/01/23 11:10:47 jtkohl Exp $
-.\" $FreeBSD$
+.\" $Id$
 .\" Copyright 1989 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
diff --git a/eBones/lib/libkrb/krb_sendauth.3 b/eBones/lib/libkrb/krb_sendauth.3
index e6d63a90d35..d014d2c3e4c 100644
--- a/eBones/lib/libkrb/krb_sendauth.3
+++ b/eBones/lib/libkrb/krb_sendauth.3
@@ -1,5 +1,5 @@
 .\" from: krb_sendauth.3,v 4.1 89/01/23 11:10:58 jtkohl Exp $
-.\" $FreeBSD$
+.\" $Id$
 .\" Copyright 1988 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
diff --git a/eBones/lib/libkrb/krb_set_tkt_string.3 b/eBones/lib/libkrb/krb_set_tkt_string.3
index 4b34fe59080..4adf84782b9 100644
--- a/eBones/lib/libkrb/krb_set_tkt_string.3
+++ b/eBones/lib/libkrb/krb_set_tkt_string.3
@@ -1,5 +1,5 @@
 .\" from: krb_set_tkt_string.3,v 4.1 89/01/23 11:11:09 jtkohl Exp $
-.\" $FreeBSD$
+.\" $Id$
 .\" Copyright 1989 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
diff --git a/eBones/lib/libkrb/krbglue.c b/eBones/lib/libkrb/krbglue.c
index 5dd04475c93..80edebacc2b 100644
--- a/eBones/lib/libkrb/krbglue.c
+++ b/eBones/lib/libkrb/krbglue.c
@@ -4,13 +4,13 @@
  * <Copyright.MIT>.
  *
  *	from: krbglue.c,v 4.1 89/01/23 15:51:50 wesommer Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char rcsid[] =
-$FreeBSD$";
+$Id$";
 #endif lint
 #endif
 
diff --git a/eBones/lib/libkrb/kuserok.3 b/eBones/lib/libkrb/kuserok.3
index 5f8e146c4a9..4108bc5783e 100644
--- a/eBones/lib/libkrb/kuserok.3
+++ b/eBones/lib/libkrb/kuserok.3
@@ -1,5 +1,5 @@
 .\" from: kuserok.3,v 4.1 89/01/23 11:11:49 jtkohl Exp $
-.\" $FreeBSD$
+.\" $Id$
 .\" Copyright 1989 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
diff --git a/eBones/lib/libkrb/kuserok.c b/eBones/lib/libkrb/kuserok.c
index 116ae502249..c02598ba362 100644
--- a/eBones/lib/libkrb/kuserok.c
+++ b/eBones/lib/libkrb/kuserok.c
@@ -7,13 +7,13 @@
  * access to a local account
  *
  *	from: kuserok.c,v 4.5 89/01/23 09:25:21 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef	lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/lib/libkrb/log.c b/eBones/lib/libkrb/log.c
index 008fdca9f1d..207fe64f7d8 100644
--- a/eBones/lib/libkrb/log.c
+++ b/eBones/lib/libkrb/log.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: log.c,v 4.7 88/12/01 14:15:14 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char *rcsid =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/mk_err.c b/eBones/lib/libkrb/mk_err.c
index 005e5f45c4a..2142b1a8865 100644
--- a/eBones/lib/libkrb/mk_err.c
+++ b/eBones/lib/libkrb/mk_err.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: mk_err.c,v 4.4 88/11/15 16:33:36 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char *rcsid =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/mk_priv.c b/eBones/lib/libkrb/mk_priv.c
index cbbeb611bf7..ecdb5405878 100644
--- a/eBones/lib/libkrb/mk_priv.c
+++ b/eBones/lib/libkrb/mk_priv.c
@@ -16,13 +16,13 @@
  * Steve Miller    Project Athena  MIT/DEC
  *
  *	from: mk_priv.c,v 4.13 89/03/22 14:48:59 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/mk_req.c b/eBones/lib/libkrb/mk_req.c
index 4eb09a203a9..ca19b2d5b82 100644
--- a/eBones/lib/libkrb/mk_req.c
+++ b/eBones/lib/libkrb/mk_req.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: der: mk_req.c,v 4.17 89/07/07 15:20:35 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char *rcsid =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/mk_safe.c b/eBones/lib/libkrb/mk_safe.c
index f434fec5d57..4e29dc21af6 100644
--- a/eBones/lib/libkrb/mk_safe.c
+++ b/eBones/lib/libkrb/mk_safe.c
@@ -15,13 +15,13 @@
  * Steve Miller    Project Athena  MIT/DEC
  *
  *	from: mk_safe.c,v 4.12 89/03/22 14:50:49 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/month_sname.c b/eBones/lib/libkrb/month_sname.c
index 70a73cffda9..79d3ec195be 100644
--- a/eBones/lib/libkrb/month_sname.c
+++ b/eBones/lib/libkrb/month_sname.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: month_sname.c,v 4.4 88/11/15 16:39:32 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char *rcsid =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/netread.c b/eBones/lib/libkrb/netread.c
index ea2f9d745e9..e0d3ae62127 100644
--- a/eBones/lib/libkrb/netread.c
+++ b/eBones/lib/libkrb/netread.c
@@ -4,13 +4,13 @@
  * <Copyright.MIT>.
  *
  *	from: netread.c,v 4.1 88/11/15 16:47:21 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef	lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/lib/libkrb/netwrite.c b/eBones/lib/libkrb/netwrite.c
index f6d09aa9930..51b38209a13 100644
--- a/eBones/lib/libkrb/netwrite.c
+++ b/eBones/lib/libkrb/netwrite.c
@@ -4,13 +4,13 @@
  * <Copyright.MIT>.
  *
  *	from: netwrite.c,v 4.1 88/11/15 16:48:58 jtkohl Exp $";
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef	lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/lib/libkrb/one.c b/eBones/lib/libkrb/one.c
index 86a439a9ae6..a986b3760a6 100644
--- a/eBones/lib/libkrb/one.c
+++ b/eBones/lib/libkrb/one.c
@@ -4,13 +4,13 @@
  * <Copyright.MIT>.
  *
  *	form: one.c,v 4.1 88/11/15 16:51:41 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef	lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/lib/libkrb/pkt_cipher.c b/eBones/lib/libkrb/pkt_cipher.c
index 59d5a39cef2..bcadcf9b2c9 100644
--- a/eBones/lib/libkrb/pkt_cipher.c
+++ b/eBones/lib/libkrb/pkt_cipher.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: pkt_cipher.c,v 4.8 89/01/13 17:46:14 steiner Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char *rcsid =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/pkt_clen.c b/eBones/lib/libkrb/pkt_clen.c
index a956ae03188..913eb8c0bc3 100644
--- a/eBones/lib/libkrb/pkt_clen.c
+++ b/eBones/lib/libkrb/pkt_clen.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: pkt_clen.c,v 4.7 88/11/15 16:56:36 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char *rcsid =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/rd_err.c b/eBones/lib/libkrb/rd_err.c
index 9d0a2b65a13..7d2f6edf4b9 100644
--- a/eBones/lib/libkrb/rd_err.c
+++ b/eBones/lib/libkrb/rd_err.c
@@ -13,13 +13,13 @@
  * Steve Miller    Project Athena  MIT/DEC
  *
  *	from: rd_err.c,v 4.5 89/01/13 17:26:38 steiner Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/rd_priv.c b/eBones/lib/libkrb/rd_priv.c
index 029ebc64535..b3a14792f84 100644
--- a/eBones/lib/libkrb/rd_priv.c
+++ b/eBones/lib/libkrb/rd_priv.c
@@ -15,13 +15,13 @@
  * Steve Miller    Project Athena  MIT/DEC
  *
  *	from: rd_priv.c,v 4.14 89/04/28 11:59:42 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char rcsid[]=
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/rd_req.c b/eBones/lib/libkrb/rd_req.c
index e6f2598ddda..422aca90270 100644
--- a/eBones/lib/libkrb/rd_req.c
+++ b/eBones/lib/libkrb/rd_req.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: der: rd_req.c,v 4.16 89/03/22 14:52:06 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char *rcsid =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/rd_safe.c b/eBones/lib/libkrb/rd_safe.c
index e60ed1e068f..5c5c1fe2732 100644
--- a/eBones/lib/libkrb/rd_safe.c
+++ b/eBones/lib/libkrb/rd_safe.c
@@ -13,13 +13,13 @@
  * Steve Miller    Project Athena  MIT/DEC
  *
  *	from: rd_safe.c,v 4.12 89/01/23 15:16:16 steiner Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/read_service_key.c b/eBones/lib/libkrb/read_service_key.c
index 7f00733637b..dd486c1eb8d 100644
--- a/eBones/lib/libkrb/read_service_key.c
+++ b/eBones/lib/libkrb/read_service_key.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: _service_key.c,v 4.10 90/03/10 19:06:56 jon Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char *rcsid =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/recvauth.c b/eBones/lib/libkrb/recvauth.c
index 492f8089de6..1438e654bc8 100644
--- a/eBones/lib/libkrb/recvauth.c
+++ b/eBones/lib/libkrb/recvauth.c
@@ -4,13 +4,13 @@
  * <Copyright.MIT>.
  *
  *	from: recvauth.c,v 4.4 90/03/10 19:03:08 jon Exp $";
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef	lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/lib/libkrb/save_credentials.c b/eBones/lib/libkrb/save_credentials.c
index 4b7c19b2b43..cf9e31b6f29 100644
--- a/eBones/lib/libkrb/save_credentials.c
+++ b/eBones/lib/libkrb/save_credentials.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: save_credentials.c,v 4.9 89/05/31 17:45:43 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char *rcsid =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/send_to_kdc.c b/eBones/lib/libkrb/send_to_kdc.c
index 19d0bd9d100..7f23a458703 100644
--- a/eBones/lib/libkrb/send_to_kdc.c
+++ b/eBones/lib/libkrb/send_to_kdc.c
@@ -4,7 +4,7 @@
  * <Copyright.MIT>.
  *
  *	from: send_to_kdc.c,v 4.20 90/01/02 13:40:37 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
diff --git a/eBones/lib/libkrb/sendauth.c b/eBones/lib/libkrb/sendauth.c
index 2ba67a84005..7289d078285 100644
--- a/eBones/lib/libkrb/sendauth.c
+++ b/eBones/lib/libkrb/sendauth.c
@@ -4,13 +4,13 @@
  * <Copyright.MIT>.
  *
  *	from: sendauth.c,v 4.6 90/03/10 23:18:28 jon Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef	lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/lib/libkrb/stime.c b/eBones/lib/libkrb/stime.c
index c31e25fa423..5b5cd75840d 100644
--- a/eBones/lib/libkrb/stime.c
+++ b/eBones/lib/libkrb/stime.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: stime.c,v 4.5 88/11/15 16:58:05 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char *rcsid =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/tf_shm.c b/eBones/lib/libkrb/tf_shm.c
index 4cb521e14f4..857dfc364bd 100644
--- a/eBones/lib/libkrb/tf_shm.c
+++ b/eBones/lib/libkrb/tf_shm.c
@@ -7,13 +7,13 @@
  * contributed by Dan Kolkowitz (kolk@jessica.stanford.edu).
  *
  *	from: tf_shm.c,v 4.2 89/10/25 23:26:46 qjb Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef	lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/lib/libkrb/tf_util.3 b/eBones/lib/libkrb/tf_util.3
index 6e05f05db2d..39ed1c026e4 100644
--- a/eBones/lib/libkrb/tf_util.3
+++ b/eBones/lib/libkrb/tf_util.3
@@ -1,5 +1,5 @@
 .\" from: tf_util.3,v 4.2 89/04/25 17:17:11 jtkohl Exp $
-.\" $FreeBSD$
+.\" $Id$
 .\" Copyright 1989 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
diff --git a/eBones/lib/libkrb/tf_util.c b/eBones/lib/libkrb/tf_util.c
index 1e720209e82..fab8ed41e33 100644
--- a/eBones/lib/libkrb/tf_util.c
+++ b/eBones/lib/libkrb/tf_util.c
@@ -4,13 +4,13 @@
  * <Copyright.MIT>.
  *
  *	from: tf_util.c,v 4.9 90/03/10 19:19:45 jon Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/tkt_string.c b/eBones/lib/libkrb/tkt_string.c
index 9b3a6dcb8cc..bdfdcd68c14 100644
--- a/eBones/lib/libkrb/tkt_string.c
+++ b/eBones/lib/libkrb/tkt_string.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: tkt_string.c,v 4.6 89/01/05 12:31:51 raeburn Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char *rcsid =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/lib/libkrb/util.c b/eBones/lib/libkrb/util.c
index df2d151e73c..74f68b95823 100644
--- a/eBones/lib/libkrb/util.c
+++ b/eBones/lib/libkrb/util.c
@@ -6,13 +6,13 @@
  * Miscellaneous debug printing utilities
  *
  *	from: util.c,v 4.8 89/01/17 22:02:08 wesommer Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef	lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/lib/librkinit/rk_krb.c b/eBones/lib/librkinit/rk_krb.c
index 4d5a47c288b..c1779e73da2 100644
--- a/eBones/lib/librkinit/rk_krb.c
+++ b/eBones/lib/librkinit/rk_krb.c
@@ -1,7 +1,7 @@
 /* 
- * $FreeBSD$
+ * $Id$
  * $Source: /home/ncvs/src/eBones/lib/librkinit/rk_krb.c,v $
- * $Author: gibbs $
+ * $Author: jkh $
  *
  * This file contains the kerberos parts of the rkinit library.
  * See the comment at the top of rk_lib.c for a description of the naming
@@ -9,7 +9,7 @@
  */
 
 #if !defined(lint) && !defined(SABER) && !defined(LOCORE) && defined(RCS_HDRS)
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$Id$";
 #endif /* lint || SABER || LOCORE || RCS_HDRS */
 
 #include <stdio.h>
diff --git a/eBones/lib/librkinit/rk_lib.c b/eBones/lib/librkinit/rk_lib.c
index 44df7b8e71f..d0b12673e1a 100644
--- a/eBones/lib/librkinit/rk_lib.c
+++ b/eBones/lib/librkinit/rk_lib.c
@@ -1,7 +1,7 @@
 /* 
- * $FreeBSD$
+ * $Id$
  * $Source: /home/ncvs/src/eBones/lib/librkinit/rk_lib.c,v $
- * $Author: pst $
+ * $Author: jkh $
  *
  * This file contains the non-rpc top-level rkinit library routines.
  * The routines in the rkinit library that should be called from clients
@@ -16,7 +16,7 @@
  */
 
 #if !defined(lint) && !defined(SABER) && !defined(LOCORE) && defined(RCS_HDRS)
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$Id$";
 #endif /* lint || SABER || LOCORE || RCS_HDRS */
 
 #include <stdio.h>
diff --git a/eBones/lib/librkinit/rk_rpc.c b/eBones/lib/librkinit/rk_rpc.c
index 425f0fb4e73..a5f70f8dea9 100644
--- a/eBones/lib/librkinit/rk_rpc.c
+++ b/eBones/lib/librkinit/rk_rpc.c
@@ -1,7 +1,7 @@
 /* 
- * $FreeBSD$
+ * $Id$
  * $Source: /home/ncvs/src/eBones/lib/librkinit/rk_rpc.c,v $
- * $Author: gibbs $
+ * $Author: jkh $
  *
  * This file contains functions that are used for network communication.
  * See the comment at the top of rk_lib.c for a description of the naming
@@ -9,7 +9,7 @@
  */
 
 #if !defined(lint) && !defined(SABER) && !defined(LOCORE) && defined(RCS_HDRS)
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$Id$";
 #endif /* lint || SABER || LOCORE || RCS_HDRS */
 
 #include <stdio.h>
diff --git a/eBones/lib/librkinit/rk_util.c b/eBones/lib/librkinit/rk_util.c
index aa4ebf40bdd..2b099e7f840 100644
--- a/eBones/lib/librkinit/rk_util.c
+++ b/eBones/lib/librkinit/rk_util.c
@@ -1,7 +1,7 @@
 /* 
- * $FreeBSD$
+ * $Id$
  * $Source: /home/ncvs/src/eBones/lib/librkinit/rk_util.c,v $
- * $Author: gibbs $
+ * $Author: jkh $
  *
  * This file contains internal routines for general use by the rkinit
  * library and server.  
@@ -11,7 +11,7 @@
  */
 
 #if !defined(lint) && !defined(SABER) && !defined(LOCORE) && defined(RCS_HDRS)
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$Id$";
 #endif /* lint || SABER || LOCORE || RCS_HDRS */
 
 #include <stdio.h>
diff --git a/eBones/lib/libtelnet/Makefile b/eBones/lib/libtelnet/Makefile
index 26a8b810b7f..94f75499080 100644
--- a/eBones/lib/libtelnet/Makefile
+++ b/eBones/lib/libtelnet/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 12/15/93
-#	$FreeBSD$
+#	$Id$
 
 LIB=	telnet
 SRCS=   encrypt.c genget.c getent.c misc.c
diff --git a/eBones/lib/libtelnet/kerberos5.c b/eBones/lib/libtelnet/kerberos5.c
index 185929335aa..1a27515e128 100644
--- a/eBones/lib/libtelnet/kerberos5.c
+++ b/eBones/lib/libtelnet/kerberos5.c
@@ -1,7 +1,7 @@
 /*
  *	$Source: /home/ncvs/src/eBones/lib/libtelnet/kerberos5.c,v $
- *	$Author: pst $
- *	$FreeBSD$
+ *	$Author: jkh $
+ *	$Id$
  */
 
 #if !defined(lint) && !defined(SABER)
@@ -9,7 +9,7 @@ static
 #ifdef __STDC__
 const
 #endif
-char rcsid_kerberos5_c[] = "$FreeBSD$";
+char rcsid_kerberos5_c[] = "$Id$";
 #endif /* lint */
 
 /*-
diff --git a/eBones/libexec/Makefile b/eBones/libexec/Makefile
index 7906b87362a..84c486c777b 100644
--- a/eBones/libexec/Makefile
+++ b/eBones/libexec/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$FreeBSD$
+#	$Id$
 
 SUBDIR=	kpropd registerd rkinitd
 
diff --git a/eBones/libexec/kpropd/Makefile b/eBones/libexec/kpropd/Makefile
index 0e13c07ff2b..4b95d184f24 100644
--- a/eBones/libexec/kpropd/Makefile
+++ b/eBones/libexec/kpropd/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$FreeBSD$
+#	$Id$
 
 PROG=	kpropd
 CFLAGS+=-I${.CURDIR}/../../usr.sbin/kprop -DKERBEROS
diff --git a/eBones/libexec/registerd/Makefile b/eBones/libexec/registerd/Makefile
index 9b4ebe4754c..3e3c0b0e4e6 100644
--- a/eBones/libexec/registerd/Makefile
+++ b/eBones/libexec/registerd/Makefile
@@ -6,7 +6,7 @@
 #
 #	@(#)Makefile	8.1 (Berkeley) 6/1/93
 #
-# $FreeBSD$
+# $Id$
 
 PROG=	registerd
 SRCS=	registerd.c
diff --git a/eBones/libexec/registerd/registerd.8 b/eBones/libexec/registerd/registerd.8
index 30e009e68ca..5e070de6984 100644
--- a/eBones/libexec/registerd/registerd.8
+++ b/eBones/libexec/registerd/registerd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)registerd.8	8.2 (Berkeley) 12/11/93
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd December 11, 1993
 .Dt REGISTERD 8
diff --git a/eBones/libexec/rkinitd/krb.c b/eBones/libexec/rkinitd/krb.c
index 48cf4a987dd..6d99f79ad69 100644
--- a/eBones/libexec/rkinitd/krb.c
+++ b/eBones/libexec/rkinitd/krb.c
@@ -1,13 +1,13 @@
 /* 
- * $FreeBSD$
+ * $Id$
  * $Source: /home/ncvs/src/eBones/libexec/rkinitd/krb.c,v $
- * $Author: gibbs $
+ * $Author: jkh $
  *
  * This file contains all of the kerberos part of rkinitd.
  */
 
 #if !defined(lint) && !defined(SABER) && !defined(LOCORE) && defined(RCS_HDRS)
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$Id$";
 #endif /* lint || SABER || LOCORE || RCS_HDRS */
 
 #include <stdio.h>
diff --git a/eBones/libexec/rkinitd/rkinitd.c b/eBones/libexec/rkinitd/rkinitd.c
index 6c8408f1d7a..dd7a89e457a 100644
--- a/eBones/libexec/rkinitd/rkinitd.c
+++ b/eBones/libexec/rkinitd/rkinitd.c
@@ -1,13 +1,13 @@
 /* 
- * $FreeBSD$
+ * $Id$
  * $Source: /home/ncvs/src/eBones/libexec/rkinitd/rkinitd.c,v $
- * $Author: gibbs $
+ * $Author: jkh $
  *
  * This is the main source file for rkinit
  */
 
 #if !defined(lint) && !defined(SABER) && !defined(LOCORE) && defined(RCS_HDRS)
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$Id$";
 #endif /* lint || SABER || LOCORE || RCS_HDRS */
 
 #include <stdio.h>
diff --git a/eBones/libexec/rkinitd/rkinitd.h b/eBones/libexec/rkinitd/rkinitd.h
index 58bfc12bea7..ef632afacbe 100644
--- a/eBones/libexec/rkinitd/rkinitd.h
+++ b/eBones/libexec/rkinitd/rkinitd.h
@@ -1,7 +1,7 @@
 /* 
- * $FreeBSD$
+ * $Id$
  * $Source: /home/ncvs/src/eBones/libexec/rkinitd/rkinitd.h,v $
- * $Author: gibbs $
+ * $Author: jkh $
  *
  * This header file contains function declarations for use for rkinitd
  */
@@ -10,7 +10,7 @@
 #define __RKINITD_H__
 
 #if !defined(lint) && !defined(SABER) && !defined(LOCORE) && defined(RCS_HDRS)
-static char *rcsid_rkinitd_h = "$FreeBSD$";
+static char *rcsid_rkinitd_h = "$Id$";
 #endif /* lint || SABER || LOCORE || RCS_HDRS */
 
 #ifdef __STDC__
diff --git a/eBones/libexec/rkinitd/rpc.c b/eBones/libexec/rkinitd/rpc.c
index a391ebc54c6..72c22301bc0 100644
--- a/eBones/libexec/rkinitd/rpc.c
+++ b/eBones/libexec/rkinitd/rpc.c
@@ -1,13 +1,13 @@
 /* 
- * $FreeBSD$
+ * $Id$
  * $Source: /home/ncvs/src/eBones/libexec/rkinitd/rpc.c,v $
- * $Author: gibbs $
+ * $Author: jkh $
  *
  * This file contains the network parts of the rkinit server.
  */
 
 #if !defined(lint) && !defined(SABER) && !defined(LOCORE) && defined(RCS_HDRS)
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$Id$";
 #endif /* lint || SABER || LOCORE || RCS_HDRS */
 
 #include <stdio.h>
diff --git a/eBones/libexec/rkinitd/util.c b/eBones/libexec/rkinitd/util.c
index 4b288a2cf79..865a693d0f4 100644
--- a/eBones/libexec/rkinitd/util.c
+++ b/eBones/libexec/rkinitd/util.c
@@ -1,13 +1,13 @@
 /* 
- * $FreeBSD$
+ * $Id$
  * $Source: /home/ncvs/src/eBones/libexec/rkinitd/util.c,v $
- * $Author: gibbs $
+ * $Author: jkh $
  *
  * This file contains general rkinit server utilities.
  */
 
 #if !defined(lint) && !defined(SABER) && !defined(LOCORE) && defined(RCS_HDRS)
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$Id$";
 #endif /* lint || SABER || LOCORE || RCS_HDRS */
 
 #include <stdio.h>
diff --git a/eBones/libexec/telnetd/Makefile b/eBones/libexec/telnetd/Makefile
index cd0434dc0b6..c0c82eef679 100644
--- a/eBones/libexec/telnetd/Makefile
+++ b/eBones/libexec/telnetd/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 12/15/93
-#	$FreeBSD$
+#	$Id$
 
 # Do not define -DKLUDGELINEMODE, as it does not interact well with many
 # telnet implementations.
diff --git a/eBones/libexec/telnetd/telnetd.8 b/eBones/libexec/telnetd/telnetd.8
index def07965aa1..8151fa0fcdd 100644
--- a/eBones/libexec/telnetd/telnetd.8
+++ b/eBones/libexec/telnetd/telnetd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)telnetd.8	8.4 (Berkeley) 6/1/94
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd June 1, 1994
 .Dt TELNETD 8
diff --git a/eBones/man/Makefile b/eBones/man/Makefile
index e9e09478598..6c74d1cb3d7 100644
--- a/eBones/man/Makefile
+++ b/eBones/man/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.4 (Berkeley) 7/25/90
-#	$FreeBSD$
+#	$Id$
 
 MAN1=	kerberos.1
 MAN5=	krb.conf.5 krb.realms.5
diff --git a/eBones/man/kerberos.1 b/eBones/man/kerberos.1
index c0e016261d6..a3eb82aac4a 100644
--- a/eBones/man/kerberos.1
+++ b/eBones/man/kerberos.1
@@ -1,5 +1,5 @@
 .\" from: kerberos.1,v 4.7 89/01/23 11:39:33 jtkohl Exp $
-.\" $FreeBSD$
+.\" $Id$
 .\" Copyright 1989 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
diff --git a/eBones/man/krb.conf.5 b/eBones/man/krb.conf.5
index d370b41d96a..fd17ed4057d 100644
--- a/eBones/man/krb.conf.5
+++ b/eBones/man/krb.conf.5
@@ -1,5 +1,5 @@
 .\" from: krb.conf.5,v 4.1 89/01/23 11:10:34 jtkohl Exp $
-.\" $FreeBSD$
+.\" $Id$
 .\" Copyright 1989 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
diff --git a/eBones/man/krb.realms.5 b/eBones/man/krb.realms.5
index 65c9db3a8a4..de9c141f1d0 100644
--- a/eBones/man/krb.realms.5
+++ b/eBones/man/krb.realms.5
@@ -1,5 +1,5 @@
 .\" from: krb.realms.5,v 4.1 89/01/23 11:10:41 jtkohl Exp $
-.\" $FreeBSD$
+.\" $Id$
 .\" Copyright 1989 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
diff --git a/eBones/patchlevel.h b/eBones/patchlevel.h
index b11bb1b9fa7..f84d1fc5f83 100644
--- a/eBones/patchlevel.h
+++ b/eBones/patchlevel.h
@@ -1,5 +1,5 @@
 /*-
- *	$FreeBSD$
+ *	$Id$
  */
 
 #define PATCHLEVEL	9
diff --git a/eBones/usr.bin/Makefile b/eBones/usr.bin/Makefile
index d1654e01031..a06a2e59e56 100644
--- a/eBones/usr.bin/Makefile
+++ b/eBones/usr.bin/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$FreeBSD$
+#	$Id$
 
 SUBDIR=	kadmin kdestroy kinit klist ksrvtgt register rkinit
 
diff --git a/eBones/usr.bin/kadmin/Makefile b/eBones/usr.bin/kadmin/Makefile
index a281e026892..74457e0af50 100644
--- a/eBones/usr.bin/kadmin/Makefile
+++ b/eBones/usr.bin/kadmin/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 PROG=	kadmin
 SRCS=	${KRBOBJDIR}/krb_err.h kadmin.c kadmin_cmds.c
diff --git a/eBones/usr.bin/kadmin/kadmin.8 b/eBones/usr.bin/kadmin/kadmin.8
index a1c12eea84a..214945e548f 100644
--- a/eBones/usr.bin/kadmin/kadmin.8
+++ b/eBones/usr.bin/kadmin/kadmin.8
@@ -1,5 +1,5 @@
 .\" from: kadmin.8,v 4.2 89/07/25 17:20:02 jtkohl Exp $
-.\" $FreeBSD$
+.\" $Id$
 .\" Copyright 1989 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
diff --git a/eBones/usr.bin/kdestroy/Makefile b/eBones/usr.bin/kdestroy/Makefile
index bc69b16e956..dfeb57055b9 100644
--- a/eBones/usr.bin/kdestroy/Makefile
+++ b/eBones/usr.bin/kdestroy/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$FreeBSD$
+#	$Id$
 
 PROG=	kdestroy
 CFLAGS+=-DKERBEROS -DDEBUG -DBSD42
diff --git a/eBones/usr.bin/kdestroy/kdestroy.1 b/eBones/usr.bin/kdestroy/kdestroy.1
index 67d0923c0b4..9fc1885fe1e 100644
--- a/eBones/usr.bin/kdestroy/kdestroy.1
+++ b/eBones/usr.bin/kdestroy/kdestroy.1
@@ -1,5 +1,5 @@
 .\" from: kdestroy.1,v 4.9 89/01/23 11:39:50 jtkohl Exp $
-.\" $FreeBSD$
+.\" $Id$
 .\" Copyright 1989 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
diff --git a/eBones/usr.bin/kdestroy/kdestroy.c b/eBones/usr.bin/kdestroy/kdestroy.c
index 27e86e1a6d7..29fde5839b6 100644
--- a/eBones/usr.bin/kdestroy/kdestroy.c
+++ b/eBones/usr.bin/kdestroy/kdestroy.c
@@ -10,13 +10,13 @@
  *   -f[orce]	- no message printed at all
  *
  *	from: kdestroy.c,v 4.5 88/03/18 15:16:02 steiner Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef	lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/usr.bin/kinit/Makefile b/eBones/usr.bin/kinit/Makefile
index d1fdfa5f9fb..beeaa493ebe 100644
--- a/eBones/usr.bin/kinit/Makefile
+++ b/eBones/usr.bin/kinit/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$FreeBSD$
+#	$Id$
 
 PROG=	kinit
 CFLAGS+=-DKERBEROS -DDEBUG -DBSD42
diff --git a/eBones/usr.bin/kinit/kinit.1 b/eBones/usr.bin/kinit/kinit.1
index 38871605e04..d0116a434ca 100644
--- a/eBones/usr.bin/kinit/kinit.1
+++ b/eBones/usr.bin/kinit/kinit.1
@@ -1,5 +1,5 @@
 .\" from: kinit.1,v 4.6 89/01/23 11:39:11 jtkohl Exp $
-.\" $FreeBSD$
+.\" $Id$
 .\" Copyright 1989 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
diff --git a/eBones/usr.bin/kinit/kinit.c b/eBones/usr.bin/kinit/kinit.c
index 8657092d889..66a6f7f2c3d 100644
--- a/eBones/usr.bin/kinit/kinit.c
+++ b/eBones/usr.bin/kinit/kinit.c
@@ -15,13 +15,13 @@
  *   -l[ifetime]
  *
  *	from: kinit.c,v 4.12 90/03/20 16:11:15 jon Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef	lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/usr.bin/klist/Makefile b/eBones/usr.bin/klist/Makefile
index f0151db231c..840a700be05 100644
--- a/eBones/usr.bin/klist/Makefile
+++ b/eBones/usr.bin/klist/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$FreeBSD$
+#	$Id$
 
 PROG=	klist
 CFLAGS+=-DKERBEROS -DDEBUG
diff --git a/eBones/usr.bin/klist/klist.1 b/eBones/usr.bin/klist/klist.1
index 1dc7ba9c20d..df8a9ec03ae 100644
--- a/eBones/usr.bin/klist/klist.1
+++ b/eBones/usr.bin/klist/klist.1
@@ -1,5 +1,5 @@
 .\" from: klist.1,v 4.8 89/01/24 14:35:09 jtkohl Exp $
-.\" $FreeBSD$
+.\" $Id$
 .\" Copyright 1989 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
diff --git a/eBones/usr.bin/klist/klist.c b/eBones/usr.bin/klist/klist.c
index 4c15305eb9b..d02bdea7293 100644
--- a/eBones/usr.bin/klist/klist.c
+++ b/eBones/usr.bin/klist/klist.c
@@ -7,13 +7,13 @@
  * Written by Bill Sommerfeld, MIT Project Athena.
  *
  *	from: klist.c,v 4.15 89/08/30 11:19:16 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef	lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/usr.bin/ksrvtgt/Makefile b/eBones/usr.bin/ksrvtgt/Makefile
index 74b19fbf508..f8a9dea3a5c 100644
--- a/eBones/usr.bin/ksrvtgt/Makefile
+++ b/eBones/usr.bin/ksrvtgt/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$FreeBSD$
+#	$Id$
 
 PROG=	ksrvtgt
 CFLAGS+=-DKERBEROS -DDEBUG
diff --git a/eBones/usr.bin/ksrvtgt/ksrvtgt.1 b/eBones/usr.bin/ksrvtgt/ksrvtgt.1
index 0534c77fc9b..26fcf4763a5 100644
--- a/eBones/usr.bin/ksrvtgt/ksrvtgt.1
+++ b/eBones/usr.bin/ksrvtgt/ksrvtgt.1
@@ -1,5 +1,5 @@
 .\" from: ksrvtgt.1,v 4.1 89/01/24 14:36:28 jtkohl Exp $
-.\" $FreeBSD$
+.\" $Id$
 .\" Copyright 1989 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
diff --git a/eBones/usr.bin/ksrvtgt/ksrvtgt.c b/eBones/usr.bin/ksrvtgt/ksrvtgt.c
index bcca91ac5d2..7c885ab7e55 100644
--- a/eBones/usr.bin/ksrvtgt/ksrvtgt.c
+++ b/eBones/usr.bin/ksrvtgt/ksrvtgt.c
@@ -7,12 +7,12 @@
  * The lifetime is the shortest allowed [1 five-minute interval]
  *
  *	from: ksrvtgt.c,v 4.3 89/07/28 10:17:28 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef lint
 const char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 
 #include <stdio.h>
diff --git a/eBones/usr.bin/passwd/kpasswd.c b/eBones/usr.bin/passwd/kpasswd.c
index ddc05fc093c..90f92474ed0 100644
--- a/eBones/usr.bin/passwd/kpasswd.c
+++ b/eBones/usr.bin/passwd/kpasswd.c
@@ -13,7 +13,7 @@ static char rcsid_kpasswd_c[] =
     "BonesHeader: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/kpasswd.c,v 4.3 89/09/26 09:33:02 jtkohl Exp ";
 #endif
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif	lint
 
 /*
diff --git a/eBones/usr.bin/register/Makefile b/eBones/usr.bin/register/Makefile
index 8bea64bbd1a..1043e10753c 100644
--- a/eBones/usr.bin/register/Makefile
+++ b/eBones/usr.bin/register/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/1/93
-#	$FreeBSD$
+#	$Id$
 
 PROG=	register
 CFLAGS+=-DCRYPT -DDEBUG -DKERBEROS
diff --git a/eBones/usr.bin/rkinit/rkinit.c b/eBones/usr.bin/rkinit/rkinit.c
index 89fc8bcd411..03fd70d476a 100644
--- a/eBones/usr.bin/rkinit/rkinit.c
+++ b/eBones/usr.bin/rkinit/rkinit.c
@@ -1,13 +1,13 @@
 /* 
- * $FreeBSD$
+ * $Id$
  * $Source: /home/ncvs/src/eBones/usr.bin/rkinit/rkinit.c,v $
- * $Author: gibbs $
+ * $Author: jkh $
  *
  * This is an rkinit client
  */
 
 #if !defined(lint) && !defined(SABER) && !defined(LOCORE) && defined(RCS_HDRS)
-static char *rcsid = "$FreeBSD$";
+static char *rcsid = "$Id$";
 #endif /* lint || SABER || LOCORE || RCS_HDRS */
 
 #include <stdio.h>
diff --git a/eBones/usr.bin/telnet/Makefile b/eBones/usr.bin/telnet/Makefile
index 7ec59bc55b1..f70b446593a 100644
--- a/eBones/usr.bin/telnet/Makefile
+++ b/eBones/usr.bin/telnet/Makefile
@@ -31,7 +31,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$FreeBSD$
+#	$Id$
 #
 
 PROG=	telnet
diff --git a/eBones/usr.sbin/Makefile b/eBones/usr.sbin/Makefile
index 1d503aafc5c..fa667f358a6 100644
--- a/eBones/usr.sbin/Makefile
+++ b/eBones/usr.sbin/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$FreeBSD$
+#	$Id$
 
 SUBDIR= ext_srvtab fix_kdb_keys kadmind kdb_destroy kdb_edit kdb_init \
 	kdb_util kerberos kprop ksrvutil kstash make_keypair
diff --git a/eBones/usr.sbin/ext_srvtab/Makefile b/eBones/usr.sbin/ext_srvtab/Makefile
index e86850c2c1a..6c62d88b097 100644
--- a/eBones/usr.sbin/ext_srvtab/Makefile
+++ b/eBones/usr.sbin/ext_srvtab/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$FreeBSD$
+#	$Id$
 
 PROG=	ext_srvtab
 CFLAGS+=-DKERBEROS
diff --git a/eBones/usr.sbin/ext_srvtab/ext_srvtab.8 b/eBones/usr.sbin/ext_srvtab/ext_srvtab.8
index 871ed90e5df..228846e5aa7 100644
--- a/eBones/usr.sbin/ext_srvtab/ext_srvtab.8
+++ b/eBones/usr.sbin/ext_srvtab/ext_srvtab.8
@@ -1,5 +1,5 @@
 .\" from: ext_srvtab.8,v 4.2 89/07/18 16:53:18 jtkohl Exp $
-.\" $FreeBSD$
+.\" $Id$
 .\" Copyright 1989 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
diff --git a/eBones/usr.sbin/ext_srvtab/ext_srvtab.c b/eBones/usr.sbin/ext_srvtab/ext_srvtab.c
index 33dfee0be1b..bd156bea878 100644
--- a/eBones/usr.sbin/ext_srvtab/ext_srvtab.c
+++ b/eBones/usr.sbin/ext_srvtab/ext_srvtab.c
@@ -2,13 +2,13 @@
  * Copyright 1987, 1988 by the Massachusetts Institute of Technology.
  *
  *	from: ext_srvtab.c,v 4.1 89/07/18 16:49:30 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef	lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/usr.sbin/fix_kdb_keys/Makefile b/eBones/usr.sbin/fix_kdb_keys/Makefile
index 86b7ed5b596..f810bf93ca0 100644
--- a/eBones/usr.sbin/fix_kdb_keys/Makefile
+++ b/eBones/usr.sbin/fix_kdb_keys/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.2 (Berkeley) 3/5/91
-#	$FreeBSD$
+#	$Id$
 
 PROG=   fix_kdb_keys
 CFLAGS+=-DKERBEROS -DDEBUG
diff --git a/eBones/usr.sbin/fix_kdb_keys/fix_kdb_keys.8 b/eBones/usr.sbin/fix_kdb_keys/fix_kdb_keys.8
index a8179ff360f..4bc4d623fc0 100644
--- a/eBones/usr.sbin/fix_kdb_keys/fix_kdb_keys.8
+++ b/eBones/usr.sbin/fix_kdb_keys/fix_kdb_keys.8
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $Id$
 .\" Copyright 1989 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
diff --git a/eBones/usr.sbin/kadmind/Makefile b/eBones/usr.sbin/kadmind/Makefile
index 09822edbb20..6a746660d69 100644
--- a/eBones/usr.sbin/kadmind/Makefile
+++ b/eBones/usr.sbin/kadmind/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 PROG=	kadmind
 SRCS=	admin_server.c kadm_funcs.c kadm_ser_wrap.c kadm_server.c
diff --git a/eBones/usr.sbin/kadmind/kadm_funcs.c b/eBones/usr.sbin/kadmind/kadm_funcs.c
index 46ccaf5468d..47dd4b405f6 100644
--- a/eBones/usr.sbin/kadmind/kadm_funcs.c
+++ b/eBones/usr.sbin/kadmind/kadm_funcs.c
@@ -12,7 +12,7 @@
 static char rcsid_kadm_funcs_c[] =
 "Id: kadm_funcs.c,v 4.3 90/03/20 01:39:51 jon Exp ";
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/usr.sbin/kadmind/kadmind.8 b/eBones/usr.sbin/kadmind/kadmind.8
index 6bffc9665a2..4978915c458 100644
--- a/eBones/usr.sbin/kadmind/kadmind.8
+++ b/eBones/usr.sbin/kadmind/kadmind.8
@@ -1,5 +1,5 @@
 .\" from: kadmind.8,v 4.1 89/07/25 17:28:33 jtkohl Exp $
-.\" $FreeBSD$
+.\" $Id$
 .\" Copyright 1989 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
diff --git a/eBones/usr.sbin/kdb_destroy/Makefile b/eBones/usr.sbin/kdb_destroy/Makefile
index 03978d11779..50a411f0e9a 100644
--- a/eBones/usr.sbin/kdb_destroy/Makefile
+++ b/eBones/usr.sbin/kdb_destroy/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$FreeBSD$
+#	$Id$
 
 PROG=	kdb_destroy
 CFLAGS+=-DKERBEROS -DDEBUG
diff --git a/eBones/usr.sbin/kdb_destroy/kdb_destroy.8 b/eBones/usr.sbin/kdb_destroy/kdb_destroy.8
index 3bb7a358745..dce45b6a5fc 100644
--- a/eBones/usr.sbin/kdb_destroy/kdb_destroy.8
+++ b/eBones/usr.sbin/kdb_destroy/kdb_destroy.8
@@ -1,5 +1,5 @@
 .\" from: kdb_destroy.8,v 4.1 89/01/23 11:08:02 jtkohl Exp $
-.\" $FreeBSD$
+.\" $Id$
 .\" Copyright 1989 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
diff --git a/eBones/usr.sbin/kdb_destroy/kdb_destroy.c b/eBones/usr.sbin/kdb_destroy/kdb_destroy.c
index 785467e6663..eb98c94b207 100644
--- a/eBones/usr.sbin/kdb_destroy/kdb_destroy.c
+++ b/eBones/usr.sbin/kdb_destroy/kdb_destroy.c
@@ -4,13 +4,13 @@
  * <Copyright.MIT>.
  *
  *	from: kdb_destroy.c,v 4.0 89/01/24 21:49:02 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef	lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/usr.sbin/kdb_edit/Makefile b/eBones/usr.sbin/kdb_edit/Makefile
index ebb35fb3c8f..98aeac52ceb 100644
--- a/eBones/usr.sbin/kdb_edit/Makefile
+++ b/eBones/usr.sbin/kdb_edit/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.2 (Berkeley) 2/14/91
-#	$FreeBSD$
+#	$Id$
 
 PROG=	kdb_edit
 CFLAGS+=-DKERBEROS -DDEBUG -I.
diff --git a/eBones/usr.sbin/kdb_edit/kdb_edit.8 b/eBones/usr.sbin/kdb_edit/kdb_edit.8
index c0a529eed95..adba31f4eff 100644
--- a/eBones/usr.sbin/kdb_edit/kdb_edit.8
+++ b/eBones/usr.sbin/kdb_edit/kdb_edit.8
@@ -1,5 +1,5 @@
 .\" from: kdb_edit.8,v 4.1 89/01/23 11:08:55 jtkohl Exp $
-.\" $FreeBSD$
+.\" $Id$
 .\" Copyright 1989 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
diff --git a/eBones/usr.sbin/kdb_edit/kdb_edit.c b/eBones/usr.sbin/kdb_edit/kdb_edit.c
index 405b8ebe101..18b36daba2e 100644
--- a/eBones/usr.sbin/kdb_edit/kdb_edit.c
+++ b/eBones/usr.sbin/kdb_edit/kdb_edit.c
@@ -8,7 +8,7 @@
  * i.e., users or services.
  *
  *	from: kdb_edit.c,v 4.2 90/01/09 16:05:09 raeburn Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*
@@ -18,7 +18,7 @@
 #if 0
 #ifndef	lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/usr.sbin/kdb_edit/maketime.c b/eBones/usr.sbin/kdb_edit/maketime.c
index afe0d256c6d..2c3a3575ed0 100644
--- a/eBones/usr.sbin/kdb_edit/maketime.c
+++ b/eBones/usr.sbin/kdb_edit/maketime.c
@@ -6,7 +6,7 @@
  * Convert a struct tm * to a UNIX time.
  *
  *	from: maketime.c,v 4.2 90/01/09 15:54:51 raeburn Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
diff --git a/eBones/usr.sbin/kdb_edit/time.h b/eBones/usr.sbin/kdb_edit/time.h
index 50a95c8cf30..42b29c1b03e 100644
--- a/eBones/usr.sbin/kdb_edit/time.h
+++ b/eBones/usr.sbin/kdb_edit/time.h
@@ -6,7 +6,7 @@
 
 /*
  *	from: time.h,v 1.1 82/05/06 11:34:29 wft Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 struct tm {     /* See defines below for allowable ranges */
diff --git a/eBones/usr.sbin/kdb_init/Makefile b/eBones/usr.sbin/kdb_init/Makefile
index df9b93428ce..17336d7ec19 100644
--- a/eBones/usr.sbin/kdb_init/Makefile
+++ b/eBones/usr.sbin/kdb_init/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$FreeBSD$
+#	$Id$
 
 PROG=	kdb_init
 CFLAGS+=-DKERBEROS -DDEBUG
diff --git a/eBones/usr.sbin/kdb_init/kdb_init.8 b/eBones/usr.sbin/kdb_init/kdb_init.8
index 66e1c284162..542ccd506ff 100644
--- a/eBones/usr.sbin/kdb_init/kdb_init.8
+++ b/eBones/usr.sbin/kdb_init/kdb_init.8
@@ -1,5 +1,5 @@
 .\" from: kdb_init.8,v 4.1 89/01/23 11:09:02 jtkohl Exp $
-.\" $FreeBSD$
+.\" $Id$
 .\" Copyright 1989 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
diff --git a/eBones/usr.sbin/kdb_init/kdb_init.c b/eBones/usr.sbin/kdb_init/kdb_init.c
index 948564cdcf2..7f9190a5188 100644
--- a/eBones/usr.sbin/kdb_init/kdb_init.c
+++ b/eBones/usr.sbin/kdb_init/kdb_init.c
@@ -7,13 +7,13 @@
  * already exists.
  *
  *	from: kdb_init.c,v 4.0 89/01/24 21:50:45 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef	lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/usr.sbin/kdb_util/Makefile b/eBones/usr.sbin/kdb_util/Makefile
index adae9f825aa..3128f59e132 100644
--- a/eBones/usr.sbin/kdb_util/Makefile
+++ b/eBones/usr.sbin/kdb_util/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.2 (Berkeley) 2/14/91
-#	$FreeBSD$
+#	$Id$
 
 PROG=	kdb_util
 CFLAGS+=-DKERBEROS -DDEBUG -I${.CURDIR}/../../kdb_edit
diff --git a/eBones/usr.sbin/kdb_util/kdb_util.8 b/eBones/usr.sbin/kdb_util/kdb_util.8
index 8e5e7e096ae..5011b84e6a1 100644
--- a/eBones/usr.sbin/kdb_util/kdb_util.8
+++ b/eBones/usr.sbin/kdb_util/kdb_util.8
@@ -1,5 +1,5 @@
 .\" from: kdb_util.8,v 4.1 89/01/23 11:09:11 jtkohl Exp $
-.\" $FreeBSD$
+.\" $Id$
 .\" Copyright 1989 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
diff --git a/eBones/usr.sbin/kdb_util/kdb_util.c b/eBones/usr.sbin/kdb_util/kdb_util.c
index 5a24d7ea90c..0c0f85b8caa 100644
--- a/eBones/usr.sbin/kdb_util/kdb_util.c
+++ b/eBones/usr.sbin/kdb_util/kdb_util.c
@@ -12,13 +12,13 @@
  * Written July 9, 1987 by Jeffrey I. Schiller
  *
  *	from: kdb_util.c,v 4.4 90/01/09 15:57:20 raeburn Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef	lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/usr.sbin/kerberos/Makefile b/eBones/usr.sbin/kerberos/Makefile
index e36611e6067..a5d022f9c80 100644
--- a/eBones/usr.sbin/kerberos/Makefile
+++ b/eBones/usr.sbin/kerberos/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$FreeBSD$
+#	$Id$
 
 PROG=	kerberos
 SRCS=	kerberos.c cr_err_reply.c
diff --git a/eBones/usr.sbin/kerberos/cr_err_reply.c b/eBones/usr.sbin/kerberos/cr_err_reply.c
index 1523c13442e..6055a0e6742 100644
--- a/eBones/usr.sbin/kerberos/cr_err_reply.c
+++ b/eBones/usr.sbin/kerberos/cr_err_reply.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: cr_err_reply.c,v 4.10 89/01/10 11:34:42 steiner Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif /* lint */
 #endif
 
diff --git a/eBones/usr.sbin/kerberos/kerberos.c b/eBones/usr.sbin/kerberos/kerberos.c
index 9c850557d64..185e79773b7 100644
--- a/eBones/usr.sbin/kerberos/kerberos.c
+++ b/eBones/usr.sbin/kerberos/kerberos.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: kerberos.c,v 4.19 89/11/01 17:18:07 qjb Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif  lint
 #endif
 
diff --git a/eBones/usr.sbin/kprop/Makefile b/eBones/usr.sbin/kprop/Makefile
index 6851365239d..809ec508a9a 100644
--- a/eBones/usr.sbin/kprop/Makefile
+++ b/eBones/usr.sbin/kprop/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$FreeBSD$
+#	$Id$
 
 PROG=	kprop
 DPADD=	${LIBKRB} ${LIBDES}
diff --git a/eBones/usr.sbin/kprop/kprop.c b/eBones/usr.sbin/kprop/kprop.c
index 210115b0150..ebd80dd0a9a 100644
--- a/eBones/usr.sbin/kprop/kprop.c
+++ b/eBones/usr.sbin/kprop/kprop.c
@@ -10,7 +10,7 @@
 #if 0
 #ifndef	lint
 static char rcsid_kprop_c[] =
-"$FreeBSD$";
+"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/usr.sbin/ksrvutil/Makefile b/eBones/usr.sbin/ksrvutil/Makefile
index 66f55be0926..62c551e4375 100644
--- a/eBones/usr.sbin/ksrvutil/Makefile
+++ b/eBones/usr.sbin/ksrvutil/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 PROG=	ksrvutil
 SRCS=	ksrvutil.c
diff --git a/eBones/usr.sbin/ksrvutil/ksrvutil.8 b/eBones/usr.sbin/ksrvutil/ksrvutil.8
index 2d8928bf4f4..30ac3fbff29 100644
--- a/eBones/usr.sbin/ksrvutil/ksrvutil.8
+++ b/eBones/usr.sbin/ksrvutil/ksrvutil.8
@@ -1,5 +1,5 @@
 .\" from: /mit/kerberos/src/man/RCS/ksrvutil.8,v 4.0 89/07/27 18:35:33 jtkohl Exp $
-.\" $FreeBSD$
+.\" $Id$
 .\" Copyright 1989 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
diff --git a/eBones/usr.sbin/ksrvutil/ksrvutil.c b/eBones/usr.sbin/ksrvutil/ksrvutil.c
index bbb428a2b48..1bc14247e39 100644
--- a/eBones/usr.sbin/ksrvutil/ksrvutil.c
+++ b/eBones/usr.sbin/ksrvutil/ksrvutil.c
@@ -12,7 +12,7 @@
 static char rcsid_ksrvutil_c[] =
 "BonesHeader: /afs/athena.mit.edu/astaff/project/kerberos/src/kadmin/RCS/ksrvutil.c,v 4.1 89/09/26 09:33:49 jtkohl Exp ";
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/usr.sbin/kstash/Makefile b/eBones/usr.sbin/kstash/Makefile
index 6be5c46988e..6cd2e199280 100644
--- a/eBones/usr.sbin/kstash/Makefile
+++ b/eBones/usr.sbin/kstash/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.2 (Berkeley) 3/5/91
-#	$FreeBSD$
+#	$Id$
 
 PROG=	kstash
 CFLAGS+=-DKERBEROS -DDEBUG
diff --git a/eBones/usr.sbin/kstash/kstash.8 b/eBones/usr.sbin/kstash/kstash.8
index 0eb426c3650..7b810abac15 100644
--- a/eBones/usr.sbin/kstash/kstash.8
+++ b/eBones/usr.sbin/kstash/kstash.8
@@ -1,5 +1,5 @@
 .\" from: kstash.8,v 4.1 89/01/23 11:11:39 jtkohl Exp $
-.\" $FreeBSD$
+.\" $Id$
 .\" Copyright 1989 by the Massachusetts Institute of Technology.
 .\"
 .\" For copying and distribution information,
diff --git a/eBones/usr.sbin/kstash/kstash.c b/eBones/usr.sbin/kstash/kstash.c
index a64b7feb43a..540c0179729 100644
--- a/eBones/usr.sbin/kstash/kstash.c
+++ b/eBones/usr.sbin/kstash/kstash.c
@@ -5,13 +5,13 @@
  * <Copyright.MIT>.
  *
  *	from: kstash.c,v 4.0 89/01/23 09:45:43 jtkohl Exp $
- *	$FreeBSD$
+ *	$Id$
  */
 
 #if 0
 #ifndef	lint
 static char rcsid[] =
-"$FreeBSD$";
+"$Id$";
 #endif	lint
 #endif
 
diff --git a/eBones/usr.sbin/make_keypair/make_keypair.8 b/eBones/usr.sbin/make_keypair/make_keypair.8
index 7804687230a..b2b4e4c12af 100644
--- a/eBones/usr.sbin/make_keypair/make_keypair.8
+++ b/eBones/usr.sbin/make_keypair/make_keypair.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)make_keypair.8	8.2 (Berkeley) 12/11/93
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd December 11, 1993
 .Dt MAKE_KEYPAIR 8
diff --git a/sbin/adjkerntz/adjkerntz.8 b/sbin/adjkerntz/adjkerntz.8
index 20fce35c6e0..cf1c76758b2 100644
--- a/sbin/adjkerntz/adjkerntz.8
+++ b/sbin/adjkerntz/adjkerntz.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd April 4, 1996
 .Dt ADJKERNTZ 8
diff --git a/sbin/badsect/badsect.8 b/sbin/badsect/badsect.8
index 0b74234fb7b..322f8c40afa 100644
--- a/sbin/badsect/badsect.8
+++ b/sbin/badsect/badsect.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)badsect.8	8.1 (Berkeley) 6/5/93
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd June 5, 1993
 .Dt BADSECT 8
diff --git a/sbin/bsdlabel/bsdlabel.8 b/sbin/bsdlabel/bsdlabel.8
index 14725f33c8f..eab396d6770 100644
--- a/sbin/bsdlabel/bsdlabel.8
+++ b/sbin/bsdlabel/bsdlabel.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)disklabel.8	8.2 (Berkeley) 4/19/94
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd "April 19, 1994"
 .Dt DISKLABEL 8
diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c
index 24fa0a236bd..ce5dae3d6a9 100644
--- a/sbin/ccdconfig/ccdconfig.c
+++ b/sbin/ccdconfig/ccdconfig.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $Id$ */
 
 /*	$NetBSD: ccdconfig.c,v 1.2.2.1 1995/11/11 02:43:35 thorpej Exp $	*/
 
diff --git a/sbin/clri/clri.8 b/sbin/clri/clri.8
index 95420c86419..187c79019b7 100644
--- a/sbin/clri/clri.8
+++ b/sbin/clri/clri.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)clri.8	8.2 (Berkeley) 4/19/94
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd April 19, 1994
 .Dt CLRI 8
diff --git a/sbin/comcontrol/comcontrol.8 b/sbin/comcontrol/comcontrol.8
index 25fd4efdb74..e9d35c61136 100644
--- a/sbin/comcontrol/comcontrol.8
+++ b/sbin/comcontrol/comcontrol.8
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$Id$
 .Dd May 15, 1994
 .Dt COMCONTROL 8
 .Os FreeBSD
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index 14725f33c8f..eab396d6770 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)disklabel.8	8.2 (Berkeley) 4/19/94
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd "April 19, 1994"
 .Dt DISKLABEL 8
diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c
index e23443dffdc..b68a1d9e4ee 100644
--- a/sbin/dmesg/dmesg.c
+++ b/sbin/dmesg/dmesg.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)dmesg.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/sbin/dset/dset.8 b/sbin/dset/dset.8
index 92cd9b7b5cf..8d960750342 100644
--- a/sbin/dset/dset.8
+++ b/sbin/dset/dset.8
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $Id$
 .\" "
 .Dd May 2, 1996
 .Dt DSET 8
diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8
index e7fda6961b9..efa6d751a31 100644
--- a/sbin/dump/dump.8
+++ b/sbin/dump/dump.8
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dump.8	8.1 (Berkeley) 6/16/93
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd June 16, 1993
 .Dt DUMP 8
diff --git a/sbin/dumpfs/dumpfs.8 b/sbin/dumpfs/dumpfs.8
index cf8135cbd6b..7f52246b436 100644
--- a/sbin/dumpfs/dumpfs.8
+++ b/sbin/dumpfs/dumpfs.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dumpfs.8	8.1 (Berkeley) 6/5/93
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd June 5, 1993
 .Dt DUMPFS 8
diff --git a/sbin/dumplfs/dumplfs.8 b/sbin/dumplfs/dumplfs.8
index 12a7dfa807f..445ff7b966e 100644
--- a/sbin/dumplfs/dumplfs.8
+++ b/sbin/dumplfs/dumplfs.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dumplfs.8	8.1 (Berkeley) 6/18/93
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd June 18, 1993
 .Dt DUMPLFS 8
diff --git a/sbin/dumpon/Makefile b/sbin/dumpon/Makefile
index 9bdc92683d7..da6f3650667 100644
--- a/sbin/dumpon/Makefile
+++ b/sbin/dumpon/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 PROG=	dumpon
 MAN8=	dumpon.8
diff --git a/sbin/dumpon/dumpon.8 b/sbin/dumpon/dumpon.8
index 5d6e621ed75..2850b43c5e6 100644
--- a/sbin/dumpon/dumpon.8
+++ b/sbin/dumpon/dumpon.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)swapon.8	8.1 (Berkeley) 6/5/93
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd May 12, 1995
 .Dt DUMPON 8
diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c
index 31a46fd97c4..27e7a3d3625 100644
--- a/sbin/dumpon/dumpon.c
+++ b/sbin/dumpon/dumpon.c
@@ -40,7 +40,7 @@ static char copyright[] =
 #ifndef lint
 /*static char sccsid[] = "From: @(#)swapon.c	8.1 (Berkeley) 6/5/93";*/
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/sbin/fsck/fsck.8 b/sbin/fsck/fsck.8
index 369454e58bd..db91f329c57 100644
--- a/sbin/fsck/fsck.8
+++ b/sbin/fsck/fsck.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fsck.8	8.2 (Berkeley) 12/11/93
-.|'	$FreeBSD$
+.|'	$Id$
 .\"
 .Dd December 11, 1993
 .Dt FSCK 8
diff --git a/sbin/fsck_ffs/fsck_ffs.8 b/sbin/fsck_ffs/fsck_ffs.8
index 369454e58bd..db91f329c57 100644
--- a/sbin/fsck_ffs/fsck_ffs.8
+++ b/sbin/fsck_ffs/fsck_ffs.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fsck.8	8.2 (Berkeley) 12/11/93
-.|'	$FreeBSD$
+.|'	$Id$
 .\"
 .Dd December 11, 1993
 .Dt FSCK 8
diff --git a/sbin/fsck_ifs/fsck_ifs.8 b/sbin/fsck_ifs/fsck_ifs.8
index 369454e58bd..db91f329c57 100644
--- a/sbin/fsck_ifs/fsck_ifs.8
+++ b/sbin/fsck_ifs/fsck_ifs.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fsck.8	8.2 (Berkeley) 12/11/93
-.|'	$FreeBSD$
+.|'	$Id$
 .\"
 .Dd December 11, 1993
 .Dt FSCK 8
diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile
index 8b2fb8f60cd..5fa4d665c23 100644
--- a/sbin/fsdb/Makefile
+++ b/sbin/fsdb/Makefile
@@ -1,6 +1,6 @@
 #	$NetBSD: Makefile,v 1.1.1.1 1995/10/08 23:08:36 thorpej Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$FreeBSD$
+#	$Id$
 
 PROG=	fsdb
 MAN8=	fsdb.8
diff --git a/sbin/fsdb/fsdb.8 b/sbin/fsdb/fsdb.8
index 08b599fcfa8..046fc46883e 100644
--- a/sbin/fsdb/fsdb.8
+++ b/sbin/fsdb/fsdb.8
@@ -26,7 +26,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd September 14, 1995
 .Dt FSDB 8
diff --git a/sbin/i386/Makefile b/sbin/i386/Makefile
index 7501cc49455..58ca50c8713 100644
--- a/sbin/i386/Makefile
+++ b/sbin/i386/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 SUBDIR=	comcontrol fdisk ft mount_msdos nextboot
 #NOTYET: cxconfig
diff --git a/sbin/i386/Makefile.inc b/sbin/i386/Makefile.inc
index c38435529c4..c961f856830 100644
--- a/sbin/i386/Makefile.inc
+++ b/sbin/i386/Makefile.inc
@@ -1,3 +1,3 @@
-#	$FreeBSD$
+#	$Id$
 
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/sbin/i386/comcontrol/comcontrol.8 b/sbin/i386/comcontrol/comcontrol.8
index 25fd4efdb74..e9d35c61136 100644
--- a/sbin/i386/comcontrol/comcontrol.8
+++ b/sbin/i386/comcontrol/comcontrol.8
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$Id$
 .Dd May 15, 1994
 .Dt COMCONTROL 8
 .Os FreeBSD
diff --git a/sbin/i386/ft/Makefile b/sbin/i386/ft/Makefile
index 90b8cb59cdf..3fb1b7440e5 100644
--- a/sbin/i386/ft/Makefile
+++ b/sbin/i386/ft/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 PROG=	ft
 MAN8=	ft.8
diff --git a/sbin/i386/mount_msdos/Makefile b/sbin/i386/mount_msdos/Makefile
index 57610ab81b8..b0460ef4290 100644
--- a/sbin/i386/mount_msdos/Makefile
+++ b/sbin/i386/mount_msdos/Makefile
@@ -1,5 +1,5 @@
 #
-#	$FreeBSD$
+#	$Id$
 #
 
 PROG=	mount_msdos
diff --git a/sbin/i386/mount_msdos/mount_msdos.8 b/sbin/i386/mount_msdos/mount_msdos.8
index 77664eb865e..4f6fcd1653d 100644
--- a/sbin/i386/mount_msdos/mount_msdos.8
+++ b/sbin/i386/mount_msdos/mount_msdos.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 April 7, 1994
 .Dt MOUNT_MSDOS 8
diff --git a/sbin/i386/mount_msdos/mount_msdos.c b/sbin/i386/mount_msdos/mount_msdos.c
index b7524480743..590ced71438 100644
--- a/sbin/i386/mount_msdos/mount_msdos.c
+++ b/sbin/i386/mount_msdos/mount_msdos.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/sbin/i386/nextboot/nextboot.8 b/sbin/i386/nextboot/nextboot.8
index 3f998c79643..dccf2e434c0 100644
--- a/sbin/i386/nextboot/nextboot.8
+++ b/sbin/i386/nextboot/nextboot.8
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$Id$
 .Dd July 9, 1996
 .Dt NEXTBOOT 8
 .\".Os BSD 4
diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile
index ad038caf2d4..28fdd26ffe2 100644
--- a/sbin/ifconfig/Makefile
+++ b/sbin/ifconfig/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$FreeBSD$
+#	$Id$
 
 PROG=	ifconfig
 MAN8=	ifconfig.8
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 3cc62421a88..2b771ef10f7 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)ifconfig.8	8.3 (Berkeley) 1/5/94
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd February 13, 1996
 .Dt IFCONFIG 8
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 116dcd15a1f..01f11143ddf 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ifconfig.c	8.2 (Berkeley) 2/16/94";
 */
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/init/Makefile b/sbin/init/Makefile
index 1d8c89c6310..244ff5ec0e0 100644
--- a/sbin/init/Makefile
+++ b/sbin/init/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-#	$FreeBSD$
+#	$Id$
 
 PROG=	init
 MAN8=	init.8
diff --git a/sbin/init/init.8 b/sbin/init/init.8
index 00b011c9c45..63dc4551b50 100644
--- a/sbin/init/init.8
+++ b/sbin/init/init.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)init.8	8.3 (Berkeley) 4/18/94
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd April 18, 1994
 .Dt INIT 8
diff --git a/sbin/ipfw/ipfw.c b/sbin/ipfw/ipfw.c
index 4145d671c68..4a85719b1c3 100644
--- a/sbin/ipfw/ipfw.c
+++ b/sbin/ipfw/ipfw.c
@@ -16,7 +16,7 @@
  *
  * NEW command line interface for IP firewall facility
  *
- * $FreeBSD$
+ * $Id$
  *
  */
 
diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c
index 5435cf4d5e0..02dbd2d2a9c 100644
--- a/sbin/md5/md5.c
+++ b/sbin/md5/md5.c
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $Id$
  *
  * Derived from:
  */
diff --git a/sbin/mknod/mknod.c b/sbin/mknod/mknod.c
index e5b02c4ed88..a3050ebec65 100644
--- a/sbin/mknod/mknod.c
+++ b/sbin/mknod/mknod.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mknod.c	8.1 (Berkeley) 6/5/93";
 #else
 static const char rcsid[] =
-    "$FreeBSD$";
+    "$Id$";
 #endif
 #endif /* not lint */
 
diff --git a/sbin/modload/Makefile b/sbin/modload/Makefile
index d55588d18f3..bff89359aee 100644
--- a/sbin/modload/Makefile
+++ b/sbin/modload/Makefile
@@ -33,7 +33,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+#	$Id$
 #
 
 PROG=	modload
diff --git a/sbin/modload/modload.8 b/sbin/modload/modload.8
index 80e11fdf9e6..ff489509579 100644
--- a/sbin/modload/modload.8
+++ b/sbin/modload/modload.8
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd September 22, 1994
 .Dt MODLOAD 8
diff --git a/sbin/modload/modload.c b/sbin/modload/modload.c
index d2aac78320a..6f1c174becc 100644
--- a/sbin/modload/modload.c
+++ b/sbin/modload/modload.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>
diff --git a/sbin/modload/pathnames.h b/sbin/modload/pathnames.h
index d4e33f03dcd..4359013dd9f 100644
--- a/sbin/modload/pathnames.h
+++ b/sbin/modload/pathnames.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $Id$ */
 #include <paths.h>
 
 #define	_PATH_LKM	"/dev/lkm"
diff --git a/sbin/modunload/Makefile b/sbin/modunload/Makefile
index f3322708d07..9d923a39687 100644
--- a/sbin/modunload/Makefile
+++ b/sbin/modunload/Makefile
@@ -33,7 +33,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+#	$Id$
 #
 
 PROG=	modunload
diff --git a/sbin/modunload/modunload.8 b/sbin/modunload/modunload.8
index c62c64409c2..a4d98e3ef5a 100644
--- a/sbin/modunload/modunload.8
+++ b/sbin/modunload/modunload.8
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd June 7, 1993
 .Dt MODUNLOAD 8
diff --git a/sbin/modunload/modunload.c b/sbin/modunload/modunload.c
index ebfb7b47e9a..f7c7c583cfc 100644
--- a/sbin/modunload/modunload.c
+++ b/sbin/modunload/modunload.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>
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index e05c8b2dc10..2961cc1b3a4 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount.8	8.7 (Berkeley) 3/27/94
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd March 27, 1994
 .Dt MOUNT 8
diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
index 0e1c4388de5..463b6601a5a 100644
--- a/sbin/mount_cd9660/mount_cd9660.c
+++ b/sbin/mount_cd9660/mount_cd9660.c
@@ -49,7 +49,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)mount_cd9660.c	8.4 (Berkeley) 3/27/94";
 */
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_ext2fs/mount_ext2fs.c b/sbin/mount_ext2fs/mount_ext2fs.c
index fc99417a098..46bfbdaadfd 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.c
+++ b/sbin/mount_ext2fs/mount_ext2fs.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)mount_lfs.c	8.3 (Berkeley) 3/27/94";
 */
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_ifs/mount.8 b/sbin/mount_ifs/mount.8
index e05c8b2dc10..2961cc1b3a4 100644
--- a/sbin/mount_ifs/mount.8
+++ b/sbin/mount_ifs/mount.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount.8	8.7 (Berkeley) 3/27/94
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd March 27, 1994
 .Dt MOUNT 8
diff --git a/sbin/mount_lfs/mount_lfs.c b/sbin/mount_lfs/mount_lfs.c
index 51d25624ede..c252b0fa0f8 100644
--- a/sbin/mount_lfs/mount_lfs.c
+++ b/sbin/mount_lfs/mount_lfs.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)mount_lfs.c	8.3 (Berkeley) 3/27/94";
 */
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_msdos/Makefile b/sbin/mount_msdos/Makefile
index 57610ab81b8..b0460ef4290 100644
--- a/sbin/mount_msdos/Makefile
+++ b/sbin/mount_msdos/Makefile
@@ -1,5 +1,5 @@
 #
-#	$FreeBSD$
+#	$Id$
 #
 
 PROG=	mount_msdos
diff --git a/sbin/mount_msdos/mount_msdos.8 b/sbin/mount_msdos/mount_msdos.8
index 77664eb865e..4f6fcd1653d 100644
--- a/sbin/mount_msdos/mount_msdos.8
+++ b/sbin/mount_msdos/mount_msdos.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 April 7, 1994
 .Dt MOUNT_MSDOS 8
diff --git a/sbin/mount_msdos/mount_msdos.c b/sbin/mount_msdos/mount_msdos.c
index b7524480743..590ced71438 100644
--- a/sbin/mount_msdos/mount_msdos.c
+++ b/sbin/mount_msdos/mount_msdos.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/sbin/mount_msdosfs/Makefile b/sbin/mount_msdosfs/Makefile
index 57610ab81b8..b0460ef4290 100644
--- a/sbin/mount_msdosfs/Makefile
+++ b/sbin/mount_msdosfs/Makefile
@@ -1,5 +1,5 @@
 #
-#	$FreeBSD$
+#	$Id$
 #
 
 PROG=	mount_msdos
diff --git a/sbin/mount_msdosfs/mount_msdosfs.8 b/sbin/mount_msdosfs/mount_msdosfs.8
index 77664eb865e..4f6fcd1653d 100644
--- a/sbin/mount_msdosfs/mount_msdosfs.8
+++ b/sbin/mount_msdosfs/mount_msdosfs.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 April 7, 1994
 .Dt MOUNT_MSDOS 8
diff --git a/sbin/mount_msdosfs/mount_msdosfs.c b/sbin/mount_msdosfs/mount_msdosfs.c
index b7524480743..590ced71438 100644
--- a/sbin/mount_msdosfs/mount_msdosfs.c
+++ b/sbin/mount_msdosfs/mount_msdosfs.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8
index 6b233145027..5048d4af272 100644
--- a/sbin/mount_nfs/mount_nfs.8
+++ b/sbin/mount_nfs/mount_nfs.8
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)mount_nfs.8	8.2 (Berkeley) 3/27/94
 .\"
-.\" $FreeBSD$
+.\" $Id$
 .\""
 .Dd March 27, 1994
 .Dt MOUNT_NFS 8
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index cbcb9ba334f..33788257654 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -45,7 +45,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)mount_nfs.c	8.3 (Berkeley) 3/27/94";
 */
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_null/mount_null.8 b/sbin/mount_null/mount_null.8
index 6d6d2e60526..1a47b27d9d6 100644
--- a/sbin/mount_null/mount_null.8
+++ b/sbin/mount_null/mount_null.8
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount_null.8	8.4 (Berkeley) 4/19/94
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd April 19, 1994
 .Dt MOUNT_NULL 8
diff --git a/sbin/mount_null/mount_null.c b/sbin/mount_null/mount_null.c
index 179e8787dbc..2d654c67240 100644
--- a/sbin/mount_null/mount_null.c
+++ b/sbin/mount_null/mount_null.c
@@ -45,7 +45,7 @@ char copyright[] =
 static char sccsid[] = "@(#)mount_null.c	8.5 (Berkeley) 3/27/94";
 */
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_nullfs/mount_nullfs.8 b/sbin/mount_nullfs/mount_nullfs.8
index 6d6d2e60526..1a47b27d9d6 100644
--- a/sbin/mount_nullfs/mount_nullfs.8
+++ b/sbin/mount_nullfs/mount_nullfs.8
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount_null.8	8.4 (Berkeley) 4/19/94
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd April 19, 1994
 .Dt MOUNT_NULL 8
diff --git a/sbin/mount_nullfs/mount_nullfs.c b/sbin/mount_nullfs/mount_nullfs.c
index 179e8787dbc..2d654c67240 100644
--- a/sbin/mount_nullfs/mount_nullfs.c
+++ b/sbin/mount_nullfs/mount_nullfs.c
@@ -45,7 +45,7 @@ char copyright[] =
 static char sccsid[] = "@(#)mount_null.c	8.5 (Berkeley) 3/27/94";
 */
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_portal/Makefile b/sbin/mount_portal/Makefile
index 1218514c77d..85eca128f4d 100644
--- a/sbin/mount_portal/Makefile
+++ b/sbin/mount_portal/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 3/27/94
-#	$FreeBSD$
+#	$Id$
 
 PROG=	mount_portal
 SRCS=	mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \
diff --git a/sbin/mount_portal/activate.c b/sbin/mount_portal/activate.c
index 7de746a6266..18e30abd1f7 100644
--- a/sbin/mount_portal/activate.c
+++ b/sbin/mount_portal/activate.c
@@ -36,7 +36,7 @@
  *
  *	@(#)activate.c	8.2 (Berkeley) 3/27/94
  *
- * $FreeBSD$
+ * $Id$
  */
 
 #include <stdio.h>
diff --git a/sbin/mount_portal/conf.c b/sbin/mount_portal/conf.c
index 5400baf0e87..b7f3e57dbf2 100644
--- a/sbin/mount_portal/conf.c
+++ b/sbin/mount_portal/conf.c
@@ -36,7 +36,7 @@
  *
  *	@(#)conf.c	8.2 (Berkeley) 3/27/94
  *
- * $FreeBSD$
+ * $Id$
  */
 
 #include <stdio.h>
diff --git a/sbin/mount_portal/mount_portal.c b/sbin/mount_portal/mount_portal.c
index e396370fd89..9ed05e52b57 100644
--- a/sbin/mount_portal/mount_portal.c
+++ b/sbin/mount_portal/mount_portal.c
@@ -45,7 +45,7 @@ char copyright[] =
 static char sccsid[] = "@(#)mount_portal.c	8.4 (Berkeley) 3/27/94";
 */
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_portal/pathnames.h b/sbin/mount_portal/pathnames.h
index 6b557704e38..3203b00c148 100644
--- a/sbin/mount_portal/pathnames.h
+++ b/sbin/mount_portal/pathnames.h
@@ -36,7 +36,7 @@
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $Id$
  */
 
 #include <paths.h>
diff --git a/sbin/mount_portal/portal.conf b/sbin/mount_portal/portal.conf
index 53a07a92231..3a4ddf0a1a9 100644
--- a/sbin/mount_portal/portal.conf
+++ b/sbin/mount_portal/portal.conf
@@ -1,5 +1,5 @@
 # @(#)portal.conf	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $Id$
 tcplisten/	tcplisten tcplisten/
 tcp/		tcp tcp/
 fs/		file fs/
diff --git a/sbin/mount_portal/portald.h b/sbin/mount_portal/portald.h
index 61f1b96b4da..23fce24198f 100644
--- a/sbin/mount_portal/portald.h
+++ b/sbin/mount_portal/portald.h
@@ -36,7 +36,7 @@
  *
  *	@(#)portald.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $Id$
  */
 
 #include <sys/cdefs.h>
diff --git a/sbin/mount_portal/pt_conf.c b/sbin/mount_portal/pt_conf.c
index dc98fbf5a5b..ae588ad54ef 100644
--- a/sbin/mount_portal/pt_conf.c
+++ b/sbin/mount_portal/pt_conf.c
@@ -36,7 +36,7 @@
  *
  *	@(#)pt_conf.c	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $Id$
  */
 
 #include <sys/types.h>
diff --git a/sbin/mount_portal/pt_exec.c b/sbin/mount_portal/pt_exec.c
index df50dc19fb3..6ee2bf57a70 100644
--- a/sbin/mount_portal/pt_exec.c
+++ b/sbin/mount_portal/pt_exec.c
@@ -36,7 +36,7 @@
  *
  *	@(#)pt_exec.c	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $Id$
  */
 
 #include <stdio.h>
diff --git a/sbin/mount_portal/pt_file.c b/sbin/mount_portal/pt_file.c
index f1189d1cc10..1c29e6d73ad 100644
--- a/sbin/mount_portal/pt_file.c
+++ b/sbin/mount_portal/pt_file.c
@@ -36,7 +36,7 @@
  *
  *	@(#)pt_file.c	8.2 (Berkeley) 3/27/94
  *
- * $FreeBSD$
+ * $Id$
  */
 
 #include <stdio.h>
diff --git a/sbin/mount_portal/pt_tcp.c b/sbin/mount_portal/pt_tcp.c
index d2001c83556..3c4962c7548 100644
--- a/sbin/mount_portal/pt_tcp.c
+++ b/sbin/mount_portal/pt_tcp.c
@@ -36,7 +36,7 @@
  *
  *	@(#)pt_tcp.c	8.3 (Berkeley) 3/27/94
  *
- * $FreeBSD$
+ * $Id$
  */
 
 #include <stdio.h>
diff --git a/sbin/mount_portalfs/Makefile b/sbin/mount_portalfs/Makefile
index 1218514c77d..85eca128f4d 100644
--- a/sbin/mount_portalfs/Makefile
+++ b/sbin/mount_portalfs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 3/27/94
-#	$FreeBSD$
+#	$Id$
 
 PROG=	mount_portal
 SRCS=	mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \
diff --git a/sbin/mount_portalfs/activate.c b/sbin/mount_portalfs/activate.c
index 7de746a6266..18e30abd1f7 100644
--- a/sbin/mount_portalfs/activate.c
+++ b/sbin/mount_portalfs/activate.c
@@ -36,7 +36,7 @@
  *
  *	@(#)activate.c	8.2 (Berkeley) 3/27/94
  *
- * $FreeBSD$
+ * $Id$
  */
 
 #include <stdio.h>
diff --git a/sbin/mount_portalfs/conf.c b/sbin/mount_portalfs/conf.c
index 5400baf0e87..b7f3e57dbf2 100644
--- a/sbin/mount_portalfs/conf.c
+++ b/sbin/mount_portalfs/conf.c
@@ -36,7 +36,7 @@
  *
  *	@(#)conf.c	8.2 (Berkeley) 3/27/94
  *
- * $FreeBSD$
+ * $Id$
  */
 
 #include <stdio.h>
diff --git a/sbin/mount_portalfs/mount_portalfs.c b/sbin/mount_portalfs/mount_portalfs.c
index e396370fd89..9ed05e52b57 100644
--- a/sbin/mount_portalfs/mount_portalfs.c
+++ b/sbin/mount_portalfs/mount_portalfs.c
@@ -45,7 +45,7 @@ char copyright[] =
 static char sccsid[] = "@(#)mount_portal.c	8.4 (Berkeley) 3/27/94";
 */
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_portalfs/pathnames.h b/sbin/mount_portalfs/pathnames.h
index 6b557704e38..3203b00c148 100644
--- a/sbin/mount_portalfs/pathnames.h
+++ b/sbin/mount_portalfs/pathnames.h
@@ -36,7 +36,7 @@
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $Id$
  */
 
 #include <paths.h>
diff --git a/sbin/mount_portalfs/portal.conf b/sbin/mount_portalfs/portal.conf
index 53a07a92231..3a4ddf0a1a9 100644
--- a/sbin/mount_portalfs/portal.conf
+++ b/sbin/mount_portalfs/portal.conf
@@ -1,5 +1,5 @@
 # @(#)portal.conf	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $Id$
 tcplisten/	tcplisten tcplisten/
 tcp/		tcp tcp/
 fs/		file fs/
diff --git a/sbin/mount_portalfs/portald.h b/sbin/mount_portalfs/portald.h
index 61f1b96b4da..23fce24198f 100644
--- a/sbin/mount_portalfs/portald.h
+++ b/sbin/mount_portalfs/portald.h
@@ -36,7 +36,7 @@
  *
  *	@(#)portald.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $Id$
  */
 
 #include <sys/cdefs.h>
diff --git a/sbin/mount_portalfs/pt_conf.c b/sbin/mount_portalfs/pt_conf.c
index dc98fbf5a5b..ae588ad54ef 100644
--- a/sbin/mount_portalfs/pt_conf.c
+++ b/sbin/mount_portalfs/pt_conf.c
@@ -36,7 +36,7 @@
  *
  *	@(#)pt_conf.c	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $Id$
  */
 
 #include <sys/types.h>
diff --git a/sbin/mount_portalfs/pt_exec.c b/sbin/mount_portalfs/pt_exec.c
index df50dc19fb3..6ee2bf57a70 100644
--- a/sbin/mount_portalfs/pt_exec.c
+++ b/sbin/mount_portalfs/pt_exec.c
@@ -36,7 +36,7 @@
  *
  *	@(#)pt_exec.c	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $Id$
  */
 
 #include <stdio.h>
diff --git a/sbin/mount_portalfs/pt_file.c b/sbin/mount_portalfs/pt_file.c
index f1189d1cc10..1c29e6d73ad 100644
--- a/sbin/mount_portalfs/pt_file.c
+++ b/sbin/mount_portalfs/pt_file.c
@@ -36,7 +36,7 @@
  *
  *	@(#)pt_file.c	8.2 (Berkeley) 3/27/94
  *
- * $FreeBSD$
+ * $Id$
  */
 
 #include <stdio.h>
diff --git a/sbin/mount_portalfs/pt_tcp.c b/sbin/mount_portalfs/pt_tcp.c
index d2001c83556..3c4962c7548 100644
--- a/sbin/mount_portalfs/pt_tcp.c
+++ b/sbin/mount_portalfs/pt_tcp.c
@@ -36,7 +36,7 @@
  *
  *	@(#)pt_tcp.c	8.3 (Berkeley) 3/27/94
  *
- * $FreeBSD$
+ * $Id$
  */
 
 #include <stdio.h>
diff --git a/sbin/mount_std/mount_std.8 b/sbin/mount_std/mount_std.8
index 66cad4fc8c5..3c5e0813036 100644
--- a/sbin/mount_std/mount_std.8
+++ b/sbin/mount_std/mount_std.8
@@ -34,7 +34,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd May 13, 1996
 .Dt MOUNT_STD 8
diff --git a/sbin/mount_std/mount_std.c b/sbin/mount_std/mount_std.c
index 6a542d49a63..06da08eb679 100644
--- a/sbin/mount_std/mount_std.c
+++ b/sbin/mount_std/mount_std.c
@@ -43,7 +43,7 @@ char copyright[] =
 
 #ifndef lint
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_umap/mount_umap.c b/sbin/mount_umap/mount_umap.c
index 9c5cb94dacb..5d884ff3dc7 100644
--- a/sbin/mount_umap/mount_umap.c
+++ b/sbin/mount_umap/mount_umap.c
@@ -45,7 +45,7 @@ char copyright[] =
 static char sccsid[] = "@(#)mount_umap.c	8.3 (Berkeley) 3/27/94";
 */
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_umapfs/mount_umapfs.c b/sbin/mount_umapfs/mount_umapfs.c
index 9c5cb94dacb..5d884ff3dc7 100644
--- a/sbin/mount_umapfs/mount_umapfs.c
+++ b/sbin/mount_umapfs/mount_umapfs.c
@@ -45,7 +45,7 @@ char copyright[] =
 static char sccsid[] = "@(#)mount_umap.c	8.3 (Berkeley) 3/27/94";
 */
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mountd/Makefile b/sbin/mountd/Makefile
index 0096b0a11e1..f32e11b895e 100644
--- a/sbin/mountd/Makefile
+++ b/sbin/mountd/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 1/25/94
-#	$FreeBSD$
+#	$Id$
 
 PROG=	mountd
 CFLAGS+=-DNFS -DMFS -DCD9660 -DMSDOSFS
diff --git a/sbin/mountd/mountd.8 b/sbin/mountd/mountd.8
index f4425ba67ef..099ac551abe 100644
--- a/sbin/mountd/mountd.8
+++ b/sbin/mountd/mountd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)mountd.8	8.1 (Berkeley) 6/9/93
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd September 22, 1994
 .Dt MOUNTD 8
diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c
index 7411228d0e0..9e573427e7d 100644
--- a/sbin/mountd/mountd.c
+++ b/sbin/mountd/mountd.c
@@ -43,7 +43,7 @@ static char copyright[] =
 #ifndef lint
 /*static char sccsid[] = "From: @(#)mountd.c	8.8 (Berkeley) 2/20/94";*/
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif /*not lint*/
 
 #include <sys/param.h>
diff --git a/sbin/newlfs/newlfs.8 b/sbin/newlfs/newlfs.8
index 8e4498327eb..63abcbe6573 100644
--- a/sbin/newlfs/newlfs.8
+++ b/sbin/newlfs/newlfs.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)newlfs.8	8.1 (Berkeley) 6/19/93
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd June 19, 1993
 .Dt NEWLFS 8
diff --git a/sbin/nextboot/nextboot.8 b/sbin/nextboot/nextboot.8
index 3f998c79643..dccf2e434c0 100644
--- a/sbin/nextboot/nextboot.8
+++ b/sbin/nextboot/nextboot.8
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$Id$
 .Dd July 9, 1996
 .Dt NEXTBOOT 8
 .\".Os BSD 4
diff --git a/sbin/nfsiod/nfsiod.8 b/sbin/nfsiod/nfsiod.8
index d82eecbc71b..1b74554591e 100644
--- a/sbin/nfsiod/nfsiod.8
+++ b/sbin/nfsiod/nfsiod.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)nfsiod.8	8.2 (Berkeley) 2/22/94
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd September 22, 1994
 .Dt NFSIOD 8
diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8
index 1d9a493a195..1bb00a996ec 100644
--- a/sbin/ping/ping.8
+++ b/sbin/ping/ping.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ping.8	8.2 (Berkeley) 12/11/93
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd December 11, 1993
 .Dt PING 8
diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8
index fbf64d57928..90dcdf4b1bf 100644
--- a/sbin/reboot/boot_i386.8
+++ b/sbin/reboot/boot_i386.8
@@ -36,7 +36,7 @@
 .\"
 .\"     @(#)boot_i386.8	8.2 (Berkeley) 4/19/94
 .\"
-.\" $FreeBSD$
+.\" $Id$
 .\"
 .Dd April 19, 1994
 .Dt BOOT 8 i386
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index 0c4938a7e15..5f7e4a87264 100644
--- a/sbin/restore/restore.8
+++ b/sbin/restore/restore.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)restore.8	8.2 (Berkeley) 12/11/93
-.\"	$FreeBSD$
+.\"	$Id$
 .\" "
 .Dd December 11, 1993
 .Dt RESTORE 8
diff --git a/sbin/route/route.8 b/sbin/route/route.8
index 121c5bb7c55..8a3596f4841 100644
--- a/sbin/route/route.8
+++ b/sbin/route/route.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)route.8	8.3 (Berkeley) 3/19/94
-.|'	$FreeBSD$
+.|'	$Id$
 .\"
 .Dd March 19, 1994
 .Dt ROUTE 8
diff --git a/sbin/route/route.c b/sbin/route/route.c
index 47923e0b22e..21b0e32b3fc 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)route.c	8.3 (Berkeley) 3/19/94";
 */
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/routed/Makefile b/sbin/routed/Makefile
index 785ad378d89..c2187c6a986 100644
--- a/sbin/routed/Makefile
+++ b/sbin/routed/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/19/93
-#	$FreeBSD$
+#	$Id$
 
 PROG=	routed
 SRCS=	if.c input.c main.c output.c parms.c radix.c rdisc.c table.c \
diff --git a/sbin/routed/defs.h b/sbin/routed/defs.h
index 74c02f151dc..bba230a3840 100644
--- a/sbin/routed/defs.h
+++ b/sbin/routed/defs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)defs.h	8.1 (Berkeley) 6/5/93
- *	$FreeBSD$
+ *	$Id$
  */
 
 /* Definitions for RIPv2 routing process.
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index 2319f2922ee..5bd5772f432 100644
--- a/sbin/routed/routed.8
+++ b/sbin/routed/routed.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)routed.8	8.2 (Berkeley) 12/11/93
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd June 1, 1996
 .Dt ROUTED 8
diff --git a/sbin/routed/rtquery/Makefile b/sbin/routed/rtquery/Makefile
index d1349dcf3e1..adc9d15eb70 100644
--- a/sbin/routed/rtquery/Makefile
+++ b/sbin/routed/rtquery/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$FreeBSD$
+#	$Id$
 
 PROG=	rtquery
 MAN8=	rtquery.8
diff --git a/sbin/routed/rtquery/rtquery.8 b/sbin/routed/rtquery/rtquery.8
index 039fc3c2871..302d9499566 100644
--- a/sbin/routed/rtquery/rtquery.8
+++ b/sbin/routed/rtquery/rtquery.8
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$Id$
 .Dd June 1, 1996
 .Dt RTQUERY 8
 .Os BSD 4.4
diff --git a/sbin/savecore/savecore.8 b/sbin/savecore/savecore.8
index 7e4a7ce605e..216cd7f0e73 100644
--- a/sbin/savecore/savecore.8
+++ b/sbin/savecore/savecore.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)savecore.8	8.1 (Berkeley) 6/5/93
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd September 23, 1994
 .Dt SAVECORE 8
diff --git a/sbin/scsi/scsi.8 b/sbin/scsi/scsi.8
index 5704f17c2aa..4254cf0a6df 100644
--- a/sbin/scsi/scsi.8
+++ b/sbin/scsi/scsi.8
@@ -39,7 +39,7 @@
 .\" SUCH DAMAGE.
 .\" 
 .\"
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd October 11, 1993
 .Dt SCSI 8
diff --git a/sbin/scsi/scsi.c b/sbin/scsi/scsi.c
index c8f1079b5ff..60ccb72f986 100644
--- a/sbin/scsi/scsi.c
+++ b/sbin/scsi/scsi.c
@@ -39,7 +39,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/sbin/scsiformat/scsiformat.8 b/sbin/scsiformat/scsiformat.8
index 8f13b0ef026..d0f18c150ab 100644
--- a/sbin/scsiformat/scsiformat.8
+++ b/sbin/scsiformat/scsiformat.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)scsiformat.8	5.1 (Berkeley) 6/5/93
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd June 5, 1993
 .Dt SCSIFORMAT 8
diff --git a/sbin/scsiformat/scsiformat.sh b/sbin/scsiformat/scsiformat.sh
index dede9883cd4..3518e29ce61 100644
--- a/sbin/scsiformat/scsiformat.sh
+++ b/sbin/scsiformat/scsiformat.sh
@@ -26,7 +26,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 # 
-# $FreeBSD$
+# $Id$
 #
 # scsiformat [-qw] [-p page-control] raw-device-name
 #
diff --git a/sbin/slattach/slattach.c b/sbin/slattach/slattach.c
index 34156bfc73d..39bd3a6d32e 100644
--- a/sbin/slattach/slattach.c
+++ b/sbin/slattach/slattach.c
@@ -42,7 +42,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)slattach.c	4.6 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/startslip/startslip.1 b/sbin/startslip/startslip.1
index 66655b19d1d..7b39ca7936d 100644
--- a/sbin/startslip/startslip.1
+++ b/sbin/startslip/startslip.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)startslip.1	8.1 (Berkeley) 6/5/93
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd June 5, 1993
 .Dt STARTSLIP 1
diff --git a/sbin/startslip/startslip.c b/sbin/startslip/startslip.c
index 60c2544c0d6..603d7db2596 100644
--- a/sbin/startslip/startslip.c
+++ b/sbin/startslip/startslip.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/sbin/swapon/swapon.8 b/sbin/swapon/swapon.8
index 6beffe6d5ca..979f77aca46 100644
--- a/sbin/swapon/swapon.8
+++ b/sbin/swapon/swapon.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)swapon.8	8.1 (Berkeley) 6/5/93
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd June 5, 1993
 .Dt SWAPON 8
diff --git a/secure/Makefile b/secure/Makefile
index 14f428a3690..e91781f463c 100644
--- a/secure/Makefile
+++ b/secure/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 # lib must be first, or it will not work.  This is because we reference
 # the lib's in the directory where they are built from the binaries we
diff --git a/secure/Makefile.inc b/secure/Makefile.inc
index 6a575b575a4..984887cac7f 100644
--- a/secure/Makefile.inc
+++ b/secure/Makefile.inc
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 DISTRIBUTION=des
 
diff --git a/secure/lib/Makefile b/secure/lib/Makefile
index b38f5dcd25f..2b47738ed2f 100644
--- a/secure/lib/Makefile
+++ b/secure/lib/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 SUBDIR= libcipher libdes
 
diff --git a/secure/lib/Makefile.inc b/secure/lib/Makefile.inc
index 8f9bd029781..d849545d140 100644
--- a/secure/lib/Makefile.inc
+++ b/secure/lib/Makefile.inc
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 .include "${.CURDIR}/../../Makefile.inc"
 .if exists(${.CURDIR}/../../../lib/Makefile.inc)
diff --git a/secure/lib/libcipher/Makefile b/secure/lib/libcipher/Makefile
index a93667f160a..28d3b2e4a09 100644
--- a/secure/lib/libcipher/Makefile
+++ b/secure/lib/libcipher/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $Id$
 #
 
 LIB=		cipher
diff --git a/secure/lib/libcipher/README b/secure/lib/libcipher/README
index ab8af5acbb2..b02ff5a15bd 100644
--- a/secure/lib/libcipher/README
+++ b/secure/lib/libcipher/README
@@ -4,7 +4,7 @@
 	  David Burren <davidb@werj.com.au>
 	  Release 1.0, March 1994
 
-    Document ref: $FreeBSD$
+    Document ref: $Id$
 
 
 Description
diff --git a/secure/lib/libcipher/README.FreeBSD b/secure/lib/libcipher/README.FreeBSD
index 2379f73015a..0dbad1ecb85 100644
--- a/secure/lib/libcipher/README.FreeBSD
+++ b/secure/lib/libcipher/README.FreeBSD
@@ -1,4 +1,4 @@
-$FreeBSD$
+$Id$
 
 This is FreeSec package for NetBSD,  unchanged for
 FreeBSD, except for the Makefile.
diff --git a/secure/lib/libcipher/cipher.3 b/secure/lib/libcipher/cipher.3
index 4ecd74f568a..28d91e64d55 100644
--- a/secure/lib/libcipher/cipher.3
+++ b/secure/lib/libcipher/cipher.3
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .\" Manual page, using -mandoc macros
 .\"
diff --git a/secure/lib/libcipher/crypt.c b/secure/lib/libcipher/crypt.c
index e08e6b3a4a1..62ea69d6ec4 100644
--- a/secure/lib/libcipher/crypt.c
+++ b/secure/lib/libcipher/crypt.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  *
  * This is an original implementation of the DES and the crypt(3) interfaces
  * by David Burren <davidb@werj.com.au>.
diff --git a/secure/lib/libcipher/test/Makefile b/secure/lib/libcipher/test/Makefile
index 50ae57100ca..dcbf1c77353 100644
--- a/secure/lib/libcipher/test/Makefile
+++ b/secure/lib/libcipher/test/Makefile
@@ -2,7 +2,7 @@
 #	Hacked Makefile to compile and run the DES-certification program,
 #	but not install anything.
 #
-# $FreeBSD$
+# $Id$
 #
 LIBCRYPT!=cd $(.CURDIR)/..; \
 	printf "xxx:\n\techo \$${.OBJDIR}/libcipher.a\n" | make -r -s -f - xxx
diff --git a/secure/lib/libcipher/test/cert.c b/secure/lib/libcipher/test/cert.c
index e9907b9a923..56dc88aebf8 100644
--- a/secure/lib/libcipher/test/cert.c
+++ b/secure/lib/libcipher/test/cert.c
@@ -3,7 +3,7 @@
  * shipped with UFC-crypt which is apparently derived from one distributed
  * with Phil Karns PD DES package.
  *
- * $FreeBSD$
+ * $Id$
  */
 
 #include <stdio.h>
diff --git a/secure/lib/libcipher/test/cert.input b/secure/lib/libcipher/test/cert.input
index e7c715c7a9d..db1749e2088 100644
--- a/secure/lib/libcipher/test/cert.input
+++ b/secure/lib/libcipher/test/cert.input
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
 #
 # Salt, key, plaintext, ciphertext
 #
diff --git a/secure/lib/libcrypt/Makefile b/secure/lib/libcrypt/Makefile
index 42f83a4a9df..39c64aba38b 100644
--- a/secure/lib/libcrypt/Makefile
+++ b/secure/lib/libcrypt/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $Id$
 #
 
 LCRYPTBASE=     libcrypt
diff --git a/secure/lib/libcrypt/README b/secure/lib/libcrypt/README
index ab8af5acbb2..b02ff5a15bd 100644
--- a/secure/lib/libcrypt/README
+++ b/secure/lib/libcrypt/README
@@ -4,7 +4,7 @@
 	  David Burren <davidb@werj.com.au>
 	  Release 1.0, March 1994
 
-    Document ref: $FreeBSD$
+    Document ref: $Id$
 
 
 Description
diff --git a/secure/lib/libcrypt/README.FreeBSD b/secure/lib/libcrypt/README.FreeBSD
index e940aeb8e3e..4a9260b31fc 100644
--- a/secure/lib/libcrypt/README.FreeBSD
+++ b/secure/lib/libcrypt/README.FreeBSD
@@ -1,4 +1,4 @@
-$FreeBSD$
+$Id$
 
 This is FreeSec package for NetBSD,  unchanged for
 FreeBSD, except for the Makefile.
diff --git a/secure/lib/libcrypt/crypt-des.c b/secure/lib/libcrypt/crypt-des.c
index d0132634510..31b2024befd 100644
--- a/secure/lib/libcrypt/crypt-des.c
+++ b/secure/lib/libcrypt/crypt-des.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  *
  * This is an original implementation of the DES and the crypt(3) interfaces
  * by David Burren <davidb@werj.com.au>.
diff --git a/secure/lib/libcrypt/crypt-md5.c b/secure/lib/libcrypt/crypt-md5.c
index 54be6c661e2..bdbf784d6e9 100644
--- a/secure/lib/libcrypt/crypt-md5.c
+++ b/secure/lib/libcrypt/crypt-md5.c
@@ -9,13 +9,13 @@
  * This has had its entry point changed to crypt_md5 for use in 
  * a dual-personality (DES & MD5) environment)  -- MarkM - Nov 1995
  *
- * $FreeBSD$
+ * $Id$
  *
  */
 
 #if 0
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$Header: /home/ncvs/src/secure/lib/libcrypt/crypt-md5.c,v 1.1 1995/12/16 09:14:09 markm Exp $";
+static char rcsid[] = "$Header: /home/ncvs/src/secure/lib/libcrypt/crypt-md5.c,v 1.2 1997/01/14 06:25:50 jkh Exp $";
 #endif /* LIBC_SCCS and not lint */
 #endif
 
diff --git a/secure/lib/libcrypt/crypt.3 b/secure/lib/libcrypt/crypt.3
index 815d7e6844d..6ab054153df 100644
--- a/secure/lib/libcrypt/crypt.3
+++ b/secure/lib/libcrypt/crypt.3
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .\" Manual page, using -mandoc macros
 .\"
diff --git a/secure/lib/libcrypt/crypt.c b/secure/lib/libcrypt/crypt.c
index d0132634510..31b2024befd 100644
--- a/secure/lib/libcrypt/crypt.c
+++ b/secure/lib/libcrypt/crypt.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  *
  * This is an original implementation of the DES and the crypt(3) interfaces
  * by David Burren <davidb@werj.com.au>.
diff --git a/secure/lib/libcrypt/test/Makefile b/secure/lib/libcrypt/test/Makefile
index 0ba817f88cd..a26e718ca1a 100644
--- a/secure/lib/libcrypt/test/Makefile
+++ b/secure/lib/libcrypt/test/Makefile
@@ -2,7 +2,7 @@
 #	Hacked Makefile to compile and run the DES-certification program,
 #	but not install anything.
 #
-# $FreeBSD$
+# $Id$
 #
 LIBCRYPT= $(.OBJDIR)/libdescrypt.a
 
diff --git a/secure/lib/libcrypt/test/cert.c b/secure/lib/libcrypt/test/cert.c
index 54c606c34d6..4e207adfa2e 100644
--- a/secure/lib/libcrypt/test/cert.c
+++ b/secure/lib/libcrypt/test/cert.c
@@ -3,7 +3,7 @@
  * shipped with UFC-crypt which is apparently derived from one distributed
  * with Phil Karns PD DES package.
  *
- * $FreeBSD$
+ * $Id$
  */
 
 #include <stdio.h>
diff --git a/secure/lib/libcrypt/test/cert.input b/secure/lib/libcrypt/test/cert.input
index e7c715c7a9d..db1749e2088 100644
--- a/secure/lib/libcrypt/test/cert.input
+++ b/secure/lib/libcrypt/test/cert.input
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
 #
 # Salt, key, plaintext, ciphertext
 #
diff --git a/secure/lib/libdes/Makefile b/secure/lib/libdes/Makefile
index 15569850a8f..9158dd0c315 100644
--- a/secure/lib/libdes/Makefile
+++ b/secure/lib/libdes/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.4 (Berkeley) 5/7/91
-#	$FreeBSD$
+#	$Id$
 
 LIB=	des
 SRCS=	cbc3_enc.c cbc_cksm.c cbc_enc.c  cfb64enc.c cfb_enc.c  \
diff --git a/secure/lib/libdes/new_rkey.c b/secure/lib/libdes/new_rkey.c
index 3435df19409..cd3e0102ad1 100644
--- a/secure/lib/libdes/new_rkey.c
+++ b/secure/lib/libdes/new_rkey.c
@@ -77,7 +77,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $Id$
  */
 
 /* 21-Nov-95 - eay - I've finally put this into libdes, I have made a
diff --git a/secure/lib/libdes/supp.c b/secure/lib/libdes/supp.c
index c098f2eb4f4..0c959cc81ac 100644
--- a/secure/lib/libdes/supp.c
+++ b/secure/lib/libdes/supp.c
@@ -76,7 +76,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/secure/usr.bin/Makefile b/secure/usr.bin/Makefile
index 250f28f1fc9..94e0a3d8a7a 100644
--- a/secure/usr.bin/Makefile
+++ b/secure/usr.bin/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 SUBDIR= bdes
 
diff --git a/secure/usr.bin/Makefile.inc b/secure/usr.bin/Makefile.inc
index e18451598e6..f7e27c3b01d 100644
--- a/secure/usr.bin/Makefile.inc
+++ b/secure/usr.bin/Makefile.inc
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 BINDIR=	/usr/bin
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/secure/usr.bin/bdes/Makefile b/secure/usr.bin/bdes/Makefile
index 2b012721204..b900778be33 100644
--- a/secure/usr.bin/bdes/Makefile
+++ b/secure/usr.bin/bdes/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$FreeBSD$
+#	$Id$
 
 PROG=	bdes
 SRCS=	bdes.c
diff --git a/usr.sbin/mount_portalfs/Makefile b/usr.sbin/mount_portalfs/Makefile
index 1218514c77d..85eca128f4d 100644
--- a/usr.sbin/mount_portalfs/Makefile
+++ b/usr.sbin/mount_portalfs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 3/27/94
-#	$FreeBSD$
+#	$Id$
 
 PROG=	mount_portal
 SRCS=	mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \
diff --git a/usr.sbin/mount_portalfs/activate.c b/usr.sbin/mount_portalfs/activate.c
index 7de746a6266..18e30abd1f7 100644
--- a/usr.sbin/mount_portalfs/activate.c
+++ b/usr.sbin/mount_portalfs/activate.c
@@ -36,7 +36,7 @@
  *
  *	@(#)activate.c	8.2 (Berkeley) 3/27/94
  *
- * $FreeBSD$
+ * $Id$
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/mount_portalfs/conf.c b/usr.sbin/mount_portalfs/conf.c
index 5400baf0e87..b7f3e57dbf2 100644
--- a/usr.sbin/mount_portalfs/conf.c
+++ b/usr.sbin/mount_portalfs/conf.c
@@ -36,7 +36,7 @@
  *
  *	@(#)conf.c	8.2 (Berkeley) 3/27/94
  *
- * $FreeBSD$
+ * $Id$
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/mount_portalfs/mount_portalfs.c b/usr.sbin/mount_portalfs/mount_portalfs.c
index e396370fd89..9ed05e52b57 100644
--- a/usr.sbin/mount_portalfs/mount_portalfs.c
+++ b/usr.sbin/mount_portalfs/mount_portalfs.c
@@ -45,7 +45,7 @@ char copyright[] =
 static char sccsid[] = "@(#)mount_portal.c	8.4 (Berkeley) 3/27/94";
 */
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.sbin/mount_portalfs/pathnames.h b/usr.sbin/mount_portalfs/pathnames.h
index 6b557704e38..3203b00c148 100644
--- a/usr.sbin/mount_portalfs/pathnames.h
+++ b/usr.sbin/mount_portalfs/pathnames.h
@@ -36,7 +36,7 @@
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $Id$
  */
 
 #include <paths.h>
diff --git a/usr.sbin/mount_portalfs/portal.conf b/usr.sbin/mount_portalfs/portal.conf
index 53a07a92231..3a4ddf0a1a9 100644
--- a/usr.sbin/mount_portalfs/portal.conf
+++ b/usr.sbin/mount_portalfs/portal.conf
@@ -1,5 +1,5 @@
 # @(#)portal.conf	8.1 (Berkeley) 6/5/93
-# $FreeBSD$
+# $Id$
 tcplisten/	tcplisten tcplisten/
 tcp/		tcp tcp/
 fs/		file fs/
diff --git a/usr.sbin/mount_portalfs/portald.h b/usr.sbin/mount_portalfs/portald.h
index 61f1b96b4da..23fce24198f 100644
--- a/usr.sbin/mount_portalfs/portald.h
+++ b/usr.sbin/mount_portalfs/portald.h
@@ -36,7 +36,7 @@
  *
  *	@(#)portald.h	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $Id$
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.sbin/mount_portalfs/pt_conf.c b/usr.sbin/mount_portalfs/pt_conf.c
index dc98fbf5a5b..ae588ad54ef 100644
--- a/usr.sbin/mount_portalfs/pt_conf.c
+++ b/usr.sbin/mount_portalfs/pt_conf.c
@@ -36,7 +36,7 @@
  *
  *	@(#)pt_conf.c	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $Id$
  */
 
 #include <sys/types.h>
diff --git a/usr.sbin/mount_portalfs/pt_exec.c b/usr.sbin/mount_portalfs/pt_exec.c
index df50dc19fb3..6ee2bf57a70 100644
--- a/usr.sbin/mount_portalfs/pt_exec.c
+++ b/usr.sbin/mount_portalfs/pt_exec.c
@@ -36,7 +36,7 @@
  *
  *	@(#)pt_exec.c	8.1 (Berkeley) 6/5/93
  *
- * $FreeBSD$
+ * $Id$
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/mount_portalfs/pt_file.c b/usr.sbin/mount_portalfs/pt_file.c
index f1189d1cc10..1c29e6d73ad 100644
--- a/usr.sbin/mount_portalfs/pt_file.c
+++ b/usr.sbin/mount_portalfs/pt_file.c
@@ -36,7 +36,7 @@
  *
  *	@(#)pt_file.c	8.2 (Berkeley) 3/27/94
  *
- * $FreeBSD$
+ * $Id$
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/mount_portalfs/pt_tcp.c b/usr.sbin/mount_portalfs/pt_tcp.c
index d2001c83556..3c4962c7548 100644
--- a/usr.sbin/mount_portalfs/pt_tcp.c
+++ b/usr.sbin/mount_portalfs/pt_tcp.c
@@ -36,7 +36,7 @@
  *
  *	@(#)pt_tcp.c	8.3 (Berkeley) 3/27/94
  *
- * $FreeBSD$
+ * $Id$
  */
 
 #include <stdio.h>
diff --git a/usr.sbin/mountd/Makefile b/usr.sbin/mountd/Makefile
index 0096b0a11e1..f32e11b895e 100644
--- a/usr.sbin/mountd/Makefile
+++ b/usr.sbin/mountd/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 1/25/94
-#	$FreeBSD$
+#	$Id$
 
 PROG=	mountd
 CFLAGS+=-DNFS -DMFS -DCD9660 -DMSDOSFS
diff --git a/usr.sbin/mountd/mountd.8 b/usr.sbin/mountd/mountd.8
index f4425ba67ef..099ac551abe 100644
--- a/usr.sbin/mountd/mountd.8
+++ b/usr.sbin/mountd/mountd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)mountd.8	8.1 (Berkeley) 6/9/93
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .Dd September 22, 1994
 .Dt MOUNTD 8
diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c
index 7411228d0e0..9e573427e7d 100644
--- a/usr.sbin/mountd/mountd.c
+++ b/usr.sbin/mountd/mountd.c
@@ -43,7 +43,7 @@ static char copyright[] =
 #ifndef lint
 /*static char sccsid[] = "From: @(#)mountd.c	8.8 (Berkeley) 2/20/94";*/
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$Id$";
 #endif /*not lint*/
 
 #include <sys/param.h>