author: Peter Wemm <peter@FreeBSD.org> 1999-08-28 01:08:13 +0000
committer: Peter Wemm <peter@FreeBSD.org> 1999-08-28 01:08:13 +0000
commit: c3aac50f284c6cca5b4f2eb46aaa13812cb8b630 (patch)
tree: 399ca96df93caf6a718d5c0499575d187c3c753c /sys
parent: 7f3dea244c40159a41ab22da77a434d7c5b5e85a (diff)
2651 files changed, 2770 insertions, 2770 deletions
diff --git a/sys/Makefile b/sys/Makefile
index fd892f3e86b9e..007745683a7b2 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.17 1999/04/21 11:09:40 jkoshy Exp $
+# $FreeBSD$
 
 # This is the old aout only boot loader.
 .if	exists(${.CURDIR}/${MACHINE}/boot) && ${OBJFORMAT} == "aout"
diff --git a/sys/alpha/alpha/atomic.s b/sys/alpha/alpha/atomic.s
index 5eb23b2d47d22..19132522aebd5 100644
--- a/sys/alpha/alpha/atomic.s
+++ b/sys/alpha/alpha/atomic.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <machine/asm.h>
diff --git a/sys/alpha/alpha/autoconf.c b/sys/alpha/alpha/autoconf.c
index 74daa01caa8e1..4eafc4f2ce7a5 100644
--- a/sys/alpha/alpha/autoconf.c
+++ b/sys/alpha/alpha/autoconf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: autoconf.c,v 1.30 1999/07/21 21:11:28 dfr Exp $
+ * $FreeBSD$
  */
 
 #include "opt_bootp.h"
diff --git a/sys/alpha/alpha/busdma_machdep.c b/sys/alpha/alpha/busdma_machdep.c
index b2267af998ea2..cfc8115502154 100644
--- a/sys/alpha/alpha/busdma_machdep.c
+++ b/sys/alpha/alpha/busdma_machdep.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: busdma_machdep.c,v 1.4 1999/07/01 20:59:56 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/alpha/clock.c b/sys/alpha/alpha/clock.c
index 0884881395506..bd51ddd0c4364 100644
--- a/sys/alpha/alpha/clock.c
+++ b/sys/alpha/alpha/clock.c
@@ -1,4 +1,4 @@
-/* $Id: clock.c,v 1.8 1999/04/25 10:45:59 dt Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: clock.c,v 1.20 1998/01/31 10:32:47 ross Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/clock_if.m b/sys/alpha/alpha/clock_if.m
index 95a2e093a552a..80c6849c5ee3a 100644
--- a/sys/alpha/alpha/clock_if.m
+++ b/sys/alpha/alpha/clock_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id: clock_if.m,v 1.2 1998/11/08 18:35:51 nsouch Exp $
+# $FreeBSD$
 #
 
 #include <machine/clockvar.h>
diff --git a/sys/alpha/alpha/cpuconf.c b/sys/alpha/alpha/cpuconf.c
index cacc31cd1c454..b9b2b313fa367 100644
--- a/sys/alpha/alpha/cpuconf.c
+++ b/sys/alpha/alpha/cpuconf.c
@@ -1,4 +1,4 @@
-/* $Id: cpuconf.c,v 1.2 1998/08/10 07:53:58 dfr Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: cpuconf.c,v 1.10 1998/03/20 21:48:21 thorpej Exp $	*/
 
 /*
diff --git a/sys/alpha/alpha/dec_axppci_33.c b/sys/alpha/alpha/dec_axppci_33.c
index 4e3e4a53366b1..98970b91fdcf7 100644
--- a/sys/alpha/alpha/dec_axppci_33.c
+++ b/sys/alpha/alpha/dec_axppci_33.c
@@ -1,4 +1,4 @@
-/* $Id: dec_axppci_33.c,v 1.2 1999/04/23 19:53:37 dt Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: dec_axppci_33.c,v 1.38 1998/07/07 08:49:12 ross Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/dec_eb164.c b/sys/alpha/alpha/dec_eb164.c
index d2a78f491e499..20884072c0a7a 100644
--- a/sys/alpha/alpha/dec_eb164.c
+++ b/sys/alpha/alpha/dec_eb164.c
@@ -1,4 +1,4 @@
-/* $Id: dec_eb164.c,v 1.5 1998/12/05 22:36:31 mjacob Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: dec_eb164.c,v 1.26 1998/04/17 02:45:19 mjacob Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/dec_eb64plus.c b/sys/alpha/alpha/dec_eb64plus.c
index 597415c90769b..19a7bd5aa208e 100644
--- a/sys/alpha/alpha/dec_eb64plus.c
+++ b/sys/alpha/alpha/dec_eb64plus.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 
 /*
  * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
diff --git a/sys/alpha/alpha/dec_kn8ae.c b/sys/alpha/alpha/dec_kn8ae.c
index e255caca60d50..d205d38e0a392 100644
--- a/sys/alpha/alpha/dec_kn8ae.c
+++ b/sys/alpha/alpha/dec_kn8ae.c
@@ -1,4 +1,4 @@
-/* $Id: dec_kn8ae.c,v 1.2 1998/06/14 13:44:42 dfr Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: dec_kn8ae.c,v 1.15 1998/02/13 00:12:50 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/diskslice_machdep.c b/sys/alpha/alpha/diskslice_machdep.c
index 7116f7d28c541..bd72d02cc82af 100644
--- a/sys/alpha/alpha/diskslice_machdep.c
+++ b/sys/alpha/alpha/diskslice_machdep.c
@@ -36,7 +36,7 @@
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
  *	from: i386/isa Id: diskslice_machdep.c,v 1.31 1998/08/10 07:22:14 phk Exp
- *	$Id: diskslice_machdep.c,v 1.9 1999/06/26 02:47:12 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/alpha/elf_machdep.c b/sys/alpha/alpha/elf_machdep.c
index 646e3536573e4..5582fcb1337de 100644
--- a/sys/alpha/alpha/elf_machdep.c
+++ b/sys/alpha/alpha/elf_machdep.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $Id: elf_machdep.c,v 1.5 1999/07/16 09:16:11 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/alpha/exception.s b/sys/alpha/alpha/exception.s
index 43828ca0b9f7f..417c5ddd92115 100644
--- a/sys/alpha/alpha/exception.s
+++ b/sys/alpha/alpha/exception.s
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* $NetBSD: locore.s,v 1.47 1998/03/22 07:26:32 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/fp_emulate.c b/sys/alpha/alpha/fp_emulate.c
index a01642afc0ae6..ad07a8ea597f4 100644
--- a/sys/alpha/alpha/fp_emulate.c
+++ b/sys/alpha/alpha/fp_emulate.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: fp_emulate.c,v 1.4 1999/06/08 16:42:13 dt Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/alpha/genassym.c b/sys/alpha/alpha/genassym.c
index 945f537aaddf6..dc838f71ace74 100644
--- a/sys/alpha/alpha/genassym.c
+++ b/sys/alpha/alpha/genassym.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$Id: genassym.c,v 1.7 1999/06/28 09:15:35 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/alpha/gensetdefs.c b/sys/alpha/alpha/gensetdefs.c
index d2aaa8d483620..c58025e2b77ed 100644
--- a/sys/alpha/alpha/gensetdefs.c
+++ b/sys/alpha/alpha/gensetdefs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: gensetdefs.c,v 1.1 1998/06/10 10:52:41 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/alpha/alpha/ieee_float.c b/sys/alpha/alpha/ieee_float.c
index fe660e249b02e..d6fa59f89456b 100644
--- a/sys/alpha/alpha/ieee_float.c
+++ b/sys/alpha/alpha/ieee_float.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ieee_float.c,v 1.4 1999/06/14 11:42:30 simokawa Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/alpha/alpha/ieee_float.h b/sys/alpha/alpha/ieee_float.h
index 1977e910a0e19..ae5b8701a944e 100644
--- a/sys/alpha/alpha/ieee_float.h
+++ b/sys/alpha/alpha/ieee_float.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #define S_FORMAT	0	/* IEEE single */
diff --git a/sys/alpha/alpha/in_cksum.c b/sys/alpha/alpha/in_cksum.c
index cbebc65853a0f..9450213595876 100644
--- a/sys/alpha/alpha/in_cksum.c
+++ b/sys/alpha/alpha/in_cksum.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* $NetBSD: in_cksum.c,v 1.7 1997/09/02 13:18:15 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/interrupt.c b/sys/alpha/alpha/interrupt.c
index 02266e090b8af..1e4d07d6950b7 100644
--- a/sys/alpha/alpha/interrupt.c
+++ b/sys/alpha/alpha/interrupt.c
@@ -1,4 +1,4 @@
-/* $Id: interrupt.c,v 1.9 1999/01/10 12:35:38 dfr Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/ipl_funcs.c b/sys/alpha/alpha/ipl_funcs.c
index 33042be0f41c5..fe761c69135a8 100644
--- a/sys/alpha/alpha/ipl_funcs.c
+++ b/sys/alpha/alpha/ipl_funcs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ipl_funcs.c,v 1.9 1998/12/24 06:05:48 mjacob Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/alpha/alpha/locore.s b/sys/alpha/alpha/locore.s
index 51639ee3e035f..510cc468b0fa3 100644
--- a/sys/alpha/alpha/locore.s
+++ b/sys/alpha/alpha/locore.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: locore.s,v 1.7 1999/05/09 19:03:55 peter Exp $
+ * $FreeBSD$
  */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c
index 0378f765415fb..5c877f120e7b1 100644
--- a/sys/alpha/alpha/machdep.c
+++ b/sys/alpha/alpha/machdep.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: machdep.c,v 1.50 1999/08/22 18:50:43 msmith Exp $
+ * $FreeBSD$
  */
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/alpha/alpha/mem.c b/sys/alpha/alpha/mem.c
index d2f5076cbe46a..9a23ce4542b4f 100644
--- a/sys/alpha/alpha/mem.c
+++ b/sys/alpha/alpha/mem.c
@@ -38,7 +38,7 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- *	$Id: mem.c,v 1.11 1999/06/27 20:52:22 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/alpha/alpha/pmap.c b/sys/alpha/alpha/pmap.c
index 62132f5b0e5e9..411b4a4ee19a6 100644
--- a/sys/alpha/alpha/pmap.c
+++ b/sys/alpha/alpha/pmap.c
@@ -43,7 +43,7 @@
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
  *	from:	i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp
  *		with some ideas from NetBSD's alpha pmap
- *	$Id: pmap.c,v 1.29 1999/07/31 23:02:52 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/alpha/alpha/procfs_machdep.c b/sys/alpha/alpha/procfs_machdep.c
index cfaa023fd01fe..000eb02a0a7f9 100644
--- a/sys/alpha/alpha/procfs_machdep.c
+++ b/sys/alpha/alpha/procfs_machdep.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_machdep.c	8.3 (Berkeley) 1/27/94
  *
  * From:
- *	$Id: procfs_machdep.c,v 1.2 1998/09/14 22:43:19 jdp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/alpha/alpha/promcons.c b/sys/alpha/alpha/promcons.c
index f3dbde81ad6fe..7a2d0e46b8f90 100644
--- a/sys/alpha/alpha/promcons.c
+++ b/sys/alpha/alpha/promcons.c
@@ -1,4 +1,4 @@
-/* $Id: promcons.c,v 1.7 1999/05/09 08:57:47 phk Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: promcons.c,v 1.13 1998/03/21 22:52:59 mycroft Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/setdef0.c b/sys/alpha/alpha/setdef0.c
index e91857f9f8155..49f662ae1d6ca 100644
--- a/sys/alpha/alpha/setdef0.c
+++ b/sys/alpha/alpha/setdef0.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: setdef0.c,v 1.2 1997/05/21 23:21:30 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifdef __ELF__
diff --git a/sys/alpha/alpha/setdef1.c b/sys/alpha/alpha/setdef1.c
index 0b2bbaa7bb578..13668f08cefc6 100644
--- a/sys/alpha/alpha/setdef1.c
+++ b/sys/alpha/alpha/setdef1.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: setdef1.c,v 1.2 1997/05/21 23:21:30 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifdef __ELF__
diff --git a/sys/alpha/alpha/sgmap.c b/sys/alpha/alpha/sgmap.c
index 493a2b15d4af9..94517e7993611 100644
--- a/sys/alpha/alpha/sgmap.c
+++ b/sys/alpha/alpha/sgmap.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/alpha/support.s b/sys/alpha/alpha/support.s
index 5b45b49b9501a..e7b6873c58d12 100644
--- a/sys/alpha/alpha/support.s
+++ b/sys/alpha/alpha/support.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: support.s,v 1.2 1998/12/20 13:21:55 dfr Exp $
+ * $FreeBSD$
  */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/alpha/alpha/swtch.s b/sys/alpha/alpha/swtch.s
index 68727ebf91f65..4c263bdd68db1 100644
--- a/sys/alpha/alpha/swtch.s
+++ b/sys/alpha/alpha/swtch.s
@@ -1,4 +1,4 @@
-/* $Id: swtch.s,v 1.9 1999/04/16 13:57:38 gallatin Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: locore.s,v 1.47 1998/03/22 07:26:32 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/sys_machdep.c b/sys/alpha/alpha/sys_machdep.c
index 0339d18d64cd4..9a85e97bc6d4d 100644
--- a/sys/alpha/alpha/sys_machdep.c
+++ b/sys/alpha/alpha/sys_machdep.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sys_machdep.c	5.5 (Berkeley) 1/19/91
- *	$Id: sys_machdep.c,v 1.4 1999/04/23 19:53:38 dt Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/alpha/alpha/timerreg.h b/sys/alpha/alpha/timerreg.h
index 1207167532299..0bfd7fc8cd630 100644
--- a/sys/alpha/alpha/timerreg.h
+++ b/sys/alpha/alpha/timerreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: Header: timerreg.h,v 1.2 93/02/28 15:08:58 mccanne Exp
- *	$Id: timerreg.h,v 1.5 1997/02/22 09:37:18 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/alpha/alpha/trap.c b/sys/alpha/alpha/trap.c
index 943593739971b..cbd42bc57b14a 100644
--- a/sys/alpha/alpha/trap.c
+++ b/sys/alpha/alpha/trap.c
@@ -1,4 +1,4 @@
-/* $Id: trap.c,v 1.16 1999/06/10 20:40:58 dt Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/alpha/vm_machdep.c b/sys/alpha/alpha/vm_machdep.c
index 4f92cf697bfd5..2f0dabb948050 100644
--- a/sys/alpha/alpha/vm_machdep.c
+++ b/sys/alpha/alpha/vm_machdep.c
@@ -38,7 +38,7 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.19 1999/08/05 23:38:13 jdp Exp $
+ * $FreeBSD$
  */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index 211a6ffb1c711..6a30b4f34915c 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.37 1999/08/21 18:34:56 wpaul Exp $
+# $FreeBSD$
 
 machine		alpha
 cpu		EV4
diff --git a/sys/alpha/conf/Makefile.alpha b/sys/alpha/conf/Makefile.alpha
index d6d3c1a063b79..dfd267a69063f 100644
--- a/sys/alpha/conf/Makefile.alpha
+++ b/sys/alpha/conf/Makefile.alpha
@@ -1,7 +1,7 @@
 # Makefile.alpha -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.alpha	7.1 5/10/91
-#	$Id: Makefile.alpha,v 1.28 1999/07/02 04:16:57 mjacob Exp $
+# $FreeBSD$
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES
index 211a6ffb1c711..6a30b4f34915c 100644
--- a/sys/alpha/conf/NOTES
+++ b/sys/alpha/conf/NOTES
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.37 1999/08/21 18:34:56 wpaul Exp $
+# $FreeBSD$
 
 machine		alpha
 cpu		EV4
diff --git a/sys/alpha/conf/SIMOS b/sys/alpha/conf/SIMOS
index d20872d5245a4..14073c4a74024 100644
--- a/sys/alpha/conf/SIMOS
+++ b/sys/alpha/conf/SIMOS
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: SIMOS,v 1.5 1999/08/08 19:28:56 phk Exp $
+# $FreeBSD$
 
 machine		"alpha"
 cpu		"EV5"
diff --git a/sys/alpha/conf/devices.alpha b/sys/alpha/conf/devices.alpha
index f686745666c2a..a6de7cd2c0aaf 100644
--- a/sys/alpha/conf/devices.alpha
+++ b/sys/alpha/conf/devices.alpha
@@ -1,6 +1,6 @@
 # This file tells what major numbers the various possible swap devices have.
 #
-#	$Id: devices.alpha,v 1.1 1998/06/10 10:54:04 dfr Exp $
+# $FreeBSD$
 #
 wd	0
 wfd	1
diff --git a/sys/alpha/conf/files.alpha b/sys/alpha/conf/files.alpha
index 52ef13c794ff3..73d380047bc5b 100644
--- a/sys/alpha/conf/files.alpha
+++ b/sys/alpha/conf/files.alpha
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.alpha,v 1.23 1999/07/03 19:19:30 peter Exp $
+# $FreeBSD$
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/alpha/conf/majors.alpha b/sys/alpha/conf/majors.alpha
index 8c22063abca1d..b1110c1838643 100644
--- a/sys/alpha/conf/majors.alpha
+++ b/sys/alpha/conf/majors.alpha
@@ -1,4 +1,4 @@
-$Id: majors.alpha,v 1.7 1999/01/18 20:38:37 gallatin Exp $
+$FreeBSD$
 
 Hopefully, this list will one day be obsoleted by DEVFS, but for now
 this is the current allocation of device major numbers.
diff --git a/sys/alpha/conf/options.alpha b/sys/alpha/conf/options.alpha
index d78c2205e96e1..fdc5b7d75249a 100644
--- a/sys/alpha/conf/options.alpha
+++ b/sys/alpha/conf/options.alpha
@@ -1,4 +1,4 @@
-#	$Id: options.alpha,v 1.11 1999/05/27 22:03:31 gallatin Exp $
+# $FreeBSD$
 
 EV5			opt_global.h
 EV4			opt_global.h
diff --git a/sys/alpha/include/_limits.h b/sys/alpha/include/_limits.h
index c8adc82fb0aed..99ca2d89843f6 100644
--- a/sys/alpha/include/_limits.h
+++ b/sys/alpha/include/_limits.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/alpha_cpu.h b/sys/alpha/include/alpha_cpu.h
index 80eb3078a309c..3e2bfb0fa3dff 100644
--- a/sys/alpha/include/alpha_cpu.h
+++ b/sys/alpha/include/alpha_cpu.h
@@ -1,4 +1,4 @@
-/* $Id: alpha_cpu.h,v 1.4 1998/12/23 11:50:50 dfr Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: alpha_cpu.h,v 1.15 1997/09/20 19:02:34 mjacob Exp */
 
 /*
diff --git a/sys/alpha/include/ansi.h b/sys/alpha/include/ansi.h
index 09413e7d49f04..f9b1f424114b8 100644
--- a/sys/alpha/include/ansi.h
+++ b/sys/alpha/include/ansi.h
@@ -1,4 +1,4 @@
-/* $Id: ansi.h,v 1.3 1998/10/12 23:57:58 alex Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: ansi.h,v 1.9 1997/11/23 20:20:53 kleink Exp */
 
 /*-
diff --git a/sys/alpha/include/asm.h b/sys/alpha/include/asm.h
index 8be98c10e0c58..d003ca910104f 100644
--- a/sys/alpha/include/asm.h
+++ b/sys/alpha/include/asm.h
@@ -1,4 +1,4 @@
-/* $Id: asm.h,v 1.2 1998/06/10 10:54:23 dfr Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: asm.h,v 1.18 1997/11/03 04:22:06 ross Exp */
 
 /* 
diff --git a/sys/alpha/include/atomic.h b/sys/alpha/include/atomic.h
index 25a27d57f00ef..d8b0499fd4dd1 100644
--- a/sys/alpha/include/atomic.h
+++ b/sys/alpha/include/atomic.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_ATOMIC_H_
diff --git a/sys/alpha/include/bootinfo.h b/sys/alpha/include/bootinfo.h
index cd45e408d85f7..86b7e7a729bb1 100644
--- a/sys/alpha/include/bootinfo.h
+++ b/sys/alpha/include/bootinfo.h
@@ -1,4 +1,4 @@
-/* $Id: bootinfo.h,v 1.3 1998/10/14 09:53:24 peter Exp $ */
+/* $FreeBSD$ */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
diff --git a/sys/alpha/include/bus.h b/sys/alpha/include/bus.h
index 52a7c694f9720..5fb1ccf7d4b9d 100644
--- a/sys/alpha/include/bus.h
+++ b/sys/alpha/include/bus.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.3 1999/06/05 13:30:01 dfr Exp $ */
+/* $FreeBSD$ */
 
 #ifndef _ALPHA_BUS_H_
 #define _ALPHA_BUS_H_
diff --git a/sys/alpha/include/bus_memio.h b/sys/alpha/include/bus_memio.h
index c7f50f78dbbff..f111ca9a7ba54 100644
--- a/sys/alpha/include/bus_memio.h
+++ b/sys/alpha/include/bus_memio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _ALPHA_BUS_MEMIO_H_
diff --git a/sys/alpha/include/bus_pio.h b/sys/alpha/include/bus_pio.h
index 286298e1968a4..1e437c86a66e9 100644
--- a/sys/alpha/include/bus_pio.h
+++ b/sys/alpha/include/bus_pio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _ALPHA_BUS_PIO_H_
diff --git a/sys/alpha/include/bwx.h b/sys/alpha/include/bwx.h
index 5489e3a4e6674..bbc3142d89261 100644
--- a/sys/alpha/include/bwx.h
+++ b/sys/alpha/include/bwx.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bwx.h,v 1.1 1998/07/05 12:14:15 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_BWX_H_
diff --git a/sys/alpha/include/chipset.h b/sys/alpha/include/chipset.h
index e9dbe87bdf178..18792f1e5221f 100644
--- a/sys/alpha/include/chipset.h
+++ b/sys/alpha/include/chipset.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: chipset.h,v 1.8 1999/05/20 15:33:16 gallatin Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_CHIPSET_H_
diff --git a/sys/alpha/include/clock.h b/sys/alpha/include/clock.h
index e1915230a842b..f243f8b203348 100644
--- a/sys/alpha/include/clock.h
+++ b/sys/alpha/include/clock.h
@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- *	$Id: clock.h,v 1.2 1998/07/22 08:26:23 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_CLOCK_H_
diff --git a/sys/alpha/include/cpu.h b/sys/alpha/include/cpu.h
index 928a05aa0fef4..cddefe118edef 100644
--- a/sys/alpha/include/cpu.h
+++ b/sys/alpha/include/cpu.h
@@ -1,4 +1,4 @@
-/* $Id: cpu.h,v 1.6 1999/04/20 22:53:53 dt Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */
 
 /*
diff --git a/sys/alpha/include/cpufunc.h b/sys/alpha/include/cpufunc.h
index 8326970978c04..eb225261071c9 100644
--- a/sys/alpha/include/cpufunc.h
+++ b/sys/alpha/include/cpufunc.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cpufunc.h,v 1.3 1998/08/17 08:21:31 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_CPUFUNC_H_
diff --git a/sys/alpha/include/elf.h b/sys/alpha/include/elf.h
index 6257ed87453d1..892d96d0337e1 100644
--- a/sys/alpha/include/elf.h
+++ b/sys/alpha/include/elf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: elf.h,v 1.6 1999/02/07 23:49:51 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_ELF_H_
diff --git a/sys/alpha/include/elf_machdep.h b/sys/alpha/include/elf_machdep.h
index f14c0fa30a23e..fe6bcc21114c4 100644
--- a/sys/alpha/include/elf_machdep.h
+++ b/sys/alpha/include/elf_machdep.h
@@ -1,4 +1,4 @@
-/* $Id$
+/* $FreeBSD$
 /* From: NetBSD: elf_machdep.h,v 1.3 1997/04/06 08:47:24 cgd Exp */
 
 #define	ELF32_MACHDEP_ENDIANNESS	XXX	/* break compilation */
diff --git a/sys/alpha/include/endian.h b/sys/alpha/include/endian.h
index 5b1fd00631977..67e4540eb4263 100644
--- a/sys/alpha/include/endian.h
+++ b/sys/alpha/include/endian.h
@@ -1,4 +1,4 @@
-/* $Id: endian.h,v 1.1 1998/01/10 10:13:14 jb Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: endian.h,v 1.5 1997/10/09 15:42:19 bouyer Exp */
 
 /*
diff --git a/sys/alpha/include/float.h b/sys/alpha/include/float.h
index de8d599c9d1a0..1a3d871d75293 100644
--- a/sys/alpha/include/float.h
+++ b/sys/alpha/include/float.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* From: NetBSD: float.h,v 1.6 1997/07/17 21:36:03 thorpej Exp */
 
 /*
diff --git a/sys/alpha/include/fpu.h b/sys/alpha/include/fpu.h
index c9efceed02930..66c557722429d 100644
--- a/sys/alpha/include/fpu.h
+++ b/sys/alpha/include/fpu.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: fpu.h,v 1.1 1998/12/04 10:52:48 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_FPU_H_
diff --git a/sys/alpha/include/frame.h b/sys/alpha/include/frame.h
index 8af1d71625176..95c0a93c2a1f4 100644
--- a/sys/alpha/include/frame.h
+++ b/sys/alpha/include/frame.h
@@ -1,4 +1,4 @@
-/* $Id: frame.h,v 1.1 1998/01/10 10:13:14 jb Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: frame.h,v 1.4 1997/04/06 08:47:27 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/ieee.h b/sys/alpha/include/ieee.h
index 701f22c2b5bb3..654d6ee861220 100644
--- a/sys/alpha/include/ieee.h
+++ b/sys/alpha/include/ieee.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* From: NetBSD: ieee.h,v 1.2 1997/04/06 08:47:27 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/ieeefp.h b/sys/alpha/include/ieeefp.h
index a838e98919553..b357101c0ceab 100644
--- a/sys/alpha/include/ieeefp.h
+++ b/sys/alpha/include/ieeefp.h
@@ -1,4 +1,4 @@
-/* $Id: ieeefp.h,v 1.1.1.1 1998/03/09 05:43:16 jb Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: ieeefp.h,v 1.2 1997/04/06 08:47:28 cgd Exp */
 
 /* 
diff --git a/sys/alpha/include/in_cksum.h b/sys/alpha/include/in_cksum.h
index 7e1c0f0dee49f..7691d71efad92 100644
--- a/sys/alpha/include/in_cksum.h
+++ b/sys/alpha/include/in_cksum.h
@@ -33,7 +33,7 @@
  *	from tahoe:	in_cksum.c	1.2	86/01/05
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
  *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
- *	$Id: in_cksum.h,v 1.5 1997/08/16 19:14:55 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/alpha/include/inst.h b/sys/alpha/include/inst.h
index 27011848b1757..b4088bc009c8e 100644
--- a/sys/alpha/include/inst.h
+++ b/sys/alpha/include/inst.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_INST_H_
diff --git a/sys/alpha/include/intr.h b/sys/alpha/include/intr.h
index ea5408920b881..4f003886ec1f9 100644
--- a/sys/alpha/include/intr.h
+++ b/sys/alpha/include/intr.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: intr.h,v 1.4 1998/11/15 18:25:16 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_INTR_H_
diff --git a/sys/alpha/include/intrcnt.h b/sys/alpha/include/intrcnt.h
index cd9e70173156d..d32494281fb38 100644
--- a/sys/alpha/include/intrcnt.h
+++ b/sys/alpha/include/intrcnt.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* $NetBSD: intrcnt.h,v 1.17 1998/11/19 01:48:04 ross Exp $ */
 
 /*
diff --git a/sys/alpha/include/ioctl_fd.h b/sys/alpha/include/ioctl_fd.h
index 970d24704104b..46f57baa95c5d 100644
--- a/sys/alpha/include/ioctl_fd.h
+++ b/sys/alpha/include/ioctl_fd.h
@@ -24,7 +24,7 @@
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  * from: ioctl_fd.h,v 1.11
  */
 
diff --git a/sys/alpha/include/ipl.h b/sys/alpha/include/ipl.h
index 79e83f3d1016c..956e141ca1698 100644
--- a/sys/alpha/include/ipl.h
+++ b/sys/alpha/include/ipl.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ipl.h,v 1.6 1998/09/19 09:29:40 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_IPL_H_
diff --git a/sys/alpha/include/limits.h b/sys/alpha/include/limits.h
index c8adc82fb0aed..99ca2d89843f6 100644
--- a/sys/alpha/include/limits.h
+++ b/sys/alpha/include/limits.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/lock.h b/sys/alpha/include/lock.h
index f10c60f4c5d5d..c2ae0fab148f8 100644
--- a/sys/alpha/include/lock.h
+++ b/sys/alpha/include/lock.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: lock.h,v 1.3 1998/07/22 08:28:24 dfr Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/alpha/include/md_var.h b/sys/alpha/include/md_var.h
index 94e87ffd7d838..42d40f3f2dfa0 100644
--- a/sys/alpha/include/md_var.h
+++ b/sys/alpha/include/md_var.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: md_var.h,v 1.6 1999/07/01 21:58:38 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_MD_VAR_H_
diff --git a/sys/alpha/include/mouse.h b/sys/alpha/include/mouse.h
index a8ef501bc349e..e2df622a0c02d 100644
--- a/sys/alpha/include/mouse.h
+++ b/sys/alpha/include/mouse.h
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mouse.h,v 1.13 1999/07/12 15:16:13 yokota Exp $
+ * $FreeBSD$
  *	from: i386/include mouse.h,v 1.10
  */
 
diff --git a/sys/alpha/include/pal.h b/sys/alpha/include/pal.h
index c3d8b31a0fdf1..b3393ce70c5a2 100644
--- a/sys/alpha/include/pal.h
+++ b/sys/alpha/include/pal.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* From: NetBSD: pal.h,v 1.1 1997/09/06 01:23:53 thorpej Exp */
 
 /* 
diff --git a/sys/alpha/include/param.h b/sys/alpha/include/param.h
index 0fbbf95717695..873ea8504b4ff 100644
--- a/sys/alpha/include/param.h
+++ b/sys/alpha/include/param.h
@@ -1,4 +1,4 @@
-/* $Id: param.h,v 1.10 1999/04/11 12:19:02 simokawa Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */
 
 /*
diff --git a/sys/alpha/include/pc/bios.h b/sys/alpha/include/pc/bios.h
index 5da68ea44b899..d85f674478d7f 100644
--- a/sys/alpha/include/pc/bios.h
+++ b/sys/alpha/include/pc/bios.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: bios.h,v 1.3 1998/08/06 09:15:54 dfr Exp $
+ * $FreeBSD$
  *      from: i386/include/pc bios.h,v 1.2
  */
 
diff --git a/sys/alpha/include/pc/display.h b/sys/alpha/include/pc/display.h
index f13c374c26a16..fad568c0cb815 100644
--- a/sys/alpha/include/pc/display.h
+++ b/sys/alpha/include/pc/display.h
@@ -1,7 +1,7 @@
 /*
  * IBM PC display definitions
  *
- *	$Id$
+ * $FreeBSD$
  *	from: i386/include/pc display.h,v 1.4
  */
 
diff --git a/sys/alpha/include/pc/msdos.h b/sys/alpha/include/pc/msdos.h
index 078238ec0d47c..d1b777fc613e3 100644
--- a/sys/alpha/include/pc/msdos.h
+++ b/sys/alpha/include/pc/msdos.h
@@ -3,7 +3,7 @@
  * [obtained from mtools -wfj]
  * how to decipher DOS disk structures in coexisting with DOS
  *
- *	$Id$
+ * $FreeBSD$
  *	from: i386/include/pc msdos.h,v 1.4
  */
 
diff --git a/sys/alpha/include/pc/vesa.h b/sys/alpha/include/pc/vesa.h
index d5d19e4603ff3..5b214086311af 100644
--- a/sys/alpha/include/pc/vesa.h
+++ b/sys/alpha/include/pc/vesa.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  * from: i386/include/pc vesa.h,v 1.1
  */
 
diff --git a/sys/alpha/include/pcb.h b/sys/alpha/include/pcb.h
index a6d4a18bde20a..3caa144f8e4f2 100644
--- a/sys/alpha/include/pcb.h
+++ b/sys/alpha/include/pcb.h
@@ -1,4 +1,4 @@
-/* $Id: pcb.h,v 1.1.1.1 1998/03/09 05:43:16 jb Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: pcb.h,v 1.6 1997/04/06 08:47:33 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/pmap.h b/sys/alpha/include/pmap.h
index 3b2f9c759cc21..321326ff40ad7 100644
--- a/sys/alpha/include/pmap.h
+++ b/sys/alpha/include/pmap.h
@@ -43,7 +43,7 @@
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
  *	from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp
- * 	$Id: pmap.h,v 1.3 1998/08/23 16:05:55 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PMAP_H_
diff --git a/sys/alpha/include/proc.h b/sys/alpha/include/proc.h
index 68add90c72556..b2a28df6eb44d 100644
--- a/sys/alpha/include/proc.h
+++ b/sys/alpha/include/proc.h
@@ -1,4 +1,4 @@
-/* $Id: proc.h,v 1.4 1998/11/15 18:25:16 dfr Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: proc.h,v 1.3 1997/04/06 08:47:36 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/profile.h b/sys/alpha/include/profile.h
index 065ae3f090cac..0eb8ef2820980 100644
--- a/sys/alpha/include/profile.h
+++ b/sys/alpha/include/profile.h
@@ -1,4 +1,4 @@
-/* $Id: profile.h,v 1.1.1.1 1998/03/09 05:43:16 jb Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: profile.h,v 1.9 1997/04/06 08:47:37 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/psl.h b/sys/alpha/include/psl.h
index b54c48edbc1b1..9fcb972332624 100644
--- a/sys/alpha/include/psl.h
+++ b/sys/alpha/include/psl.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/alpha/include/pte.h b/sys/alpha/include/pte.h
index 4981272d48fe0..8ceb6a5f377e3 100644
--- a/sys/alpha/include/pte.h
+++ b/sys/alpha/include/pte.h
@@ -1,4 +1,4 @@
-/* $Id: pte.h,v 1.1.1.1 1998/03/09 05:43:16 jb Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: pte.h,v 1.10 1997/09/02 19:07:22 thorpej Exp */
 
 /*
diff --git a/sys/alpha/include/ptrace.h b/sys/alpha/include/ptrace.h
index 27f3b2423082f..d69c5474fb5b1 100644
--- a/sys/alpha/include/ptrace.h
+++ b/sys/alpha/include/ptrace.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $Id: ptrace.h,v 1.1 1998/06/10 10:55:24 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PTRACE_H_
diff --git a/sys/alpha/include/reg.h b/sys/alpha/include/reg.h
index 40569a0089c6d..341a396591787 100644
--- a/sys/alpha/include/reg.h
+++ b/sys/alpha/include/reg.h
@@ -1,4 +1,4 @@
-/* $Id: reg.h,v 1.3 1999/04/03 22:19:57 jdp Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: reg.h,v 1.3 1997/04/06 08:47:40 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/resource.h b/sys/alpha/include/resource.h
index 279c8db5d31d9..c9253c9dc0db6 100644
--- a/sys/alpha/include/resource.h
+++ b/sys/alpha/include/resource.h
@@ -1,4 +1,4 @@
-/* $Id: resource.h,v 1.1 1998/11/17 10:40:33 dfr Exp $ */
+/* $FreeBSD$ */
 /*
  * Copyright 1998 Massachusetts Institute of Technology
  *
diff --git a/sys/alpha/include/setjmp.h b/sys/alpha/include/setjmp.h
index bf9bac25c5285..5fcfe2ab55fcf 100644
--- a/sys/alpha/include/setjmp.h
+++ b/sys/alpha/include/setjmp.h
@@ -1,4 +1,4 @@
-/* $Id: setjmp.h,v 1.1 1998/01/10 23:00:06 jb Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: setjmp.h,v 1.2 1997/04/06 08:47:41 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/sgmap.h b/sys/alpha/include/sgmap.h
index 65299c746a728..08ccbc7b7a47b 100644
--- a/sys/alpha/include/sgmap.h
+++ b/sys/alpha/include/sgmap.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_SGMAP_H_
diff --git a/sys/alpha/include/signal.h b/sys/alpha/include/signal.h
index eb335c0639811..07eaba12425a7 100644
--- a/sys/alpha/include/signal.h
+++ b/sys/alpha/include/signal.h
@@ -1,4 +1,4 @@
-/* $Id: signal.h,v 1.1 1998/01/10 10:13:16 jb Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: signal.h,v 1.3 1997/04/06 08:47:43 cgd Exp */
 
 /*
diff --git a/sys/alpha/include/stdarg.h b/sys/alpha/include/stdarg.h
index 2fa81e60b872c..2003b7bd4e1a3 100644
--- a/sys/alpha/include/stdarg.h
+++ b/sys/alpha/include/stdarg.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* From: NetBSD: stdarg.h,v 1.7 1997/04/06 08:47:44 cgd Exp */
 
 /*-
diff --git a/sys/alpha/include/swiz.h b/sys/alpha/include/swiz.h
index 5c84a49a75009..4b6397aeccecb 100644
--- a/sys/alpha/include/swiz.h
+++ b/sys/alpha/include/swiz.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swiz.h,v 1.1 1998/07/27 09:40:35 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_SWIZ_H_
diff --git a/sys/alpha/include/sysarch.h b/sys/alpha/include/sysarch.h
index e0e0a6b9b6178..8eda490525efc 100644
--- a/sys/alpha/include/sysarch.h
+++ b/sys/alpha/include/sysarch.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sysarch.h,v 1.1 1998/11/17 10:40:07 dfr Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/alpha/include/types.h b/sys/alpha/include/types.h
index f293bc5268dad..03e186996b34a 100644
--- a/sys/alpha/include/types.h
+++ b/sys/alpha/include/types.h
@@ -1,4 +1,4 @@
-/* $Id: types.h,v 1.8 1998/07/14 05:09:42 bde Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: types.h,v 1.8 1997/04/06 08:47:45 cgd Exp */
 
 /*-
diff --git a/sys/alpha/include/varargs.h b/sys/alpha/include/varargs.h
index f7a11b985ef00..d355ec8ac931d 100644
--- a/sys/alpha/include/varargs.h
+++ b/sys/alpha/include/varargs.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* From: NetBSD: varargs.h,v 1.7 1997/04/06 08:47:46 cgd Exp */
 
 /*-
diff --git a/sys/alpha/include/vmparam.h b/sys/alpha/include/vmparam.h
index 04c62a65a5460..b055549c3ab8e 100644
--- a/sys/alpha/include/vmparam.h
+++ b/sys/alpha/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $Id: vmparam.h,v 1.3 1998/06/14 13:45:15 dfr Exp $ */
+/* $FreeBSD$ */
 /* From: NetBSD: vmparam.h,v 1.6 1997/09/23 23:23:23 mjacob Exp */
 #ifndef	_ALPHA_VMPARAM_H
 #define	_ALPHA_VMPARAM_H
diff --git a/sys/alpha/isa/isa.c b/sys/alpha/isa/isa.c
index 920751f10edf5..19b8ca54e3eb2 100644
--- a/sys/alpha/isa/isa.c
+++ b/sys/alpha/isa/isa.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: isa.c,v 1.16 1999/05/22 15:18:15 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/isa/isa_dma.c b/sys/alpha/isa/isa_dma.c
index 2cb3e2c70d593..4fcdc6b691304 100644
--- a/sys/alpha/isa/isa_dma.c
+++ b/sys/alpha/isa/isa_dma.c
@@ -35,7 +35,7 @@
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
  *	from: isa_dma.c,v 1.3 1999/05/09 23:56:00 peter Exp $
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/alpha/isa/isavar.h b/sys/alpha/isa/isavar.h
index 0eee66e687ca1..a77cb35adc10b 100644
--- a/sys/alpha/isa/isavar.h
+++ b/sys/alpha/isa/isavar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: isavar.h,v 1.1 1999/04/16 21:21:37 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/alpha/isa/mcclock_isa.c b/sys/alpha/isa/mcclock_isa.c
index da310f0362978..4eee37acb4cf8 100644
--- a/sys/alpha/isa/mcclock_isa.c
+++ b/sys/alpha/isa/mcclock_isa.c
@@ -1,4 +1,4 @@
-/* $Id: mcclock_isa.c,v 1.5 1999/05/18 21:24:11 dfr Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: mcclock_tlsb.c,v 1.8 1998/05/13 02:50:29 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/linux/Makefile b/sys/alpha/linux/Makefile
index d399ad080a374..c062c96ec1779 100644
--- a/sys/alpha/linux/Makefile
+++ b/sys/alpha/linux/Makefile
@@ -1,6 +1,6 @@
 # Makefile for syscall tables
 #
-# $Id: Makefile,v 1.2 1997/03/29 10:48:49 peter Exp $
+# $FreeBSD$
 
 all:
 	@echo "make linux_sysent.c only"
diff --git a/sys/alpha/linux/linux.h b/sys/alpha/linux/linux.h
index 93fafa2a37124..4e5db53e99cfe 100644
--- a/sys/alpha/linux/linux.h
+++ b/sys/alpha/linux/linux.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: linux.h,v 1.34 1999/08/15 17:28:39 marcel Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_LINUX_LINUX_H_
diff --git a/sys/alpha/linux/linux_dummy.c b/sys/alpha/linux/linux_dummy.c
index 5d5169d996895..c76402c31e685 100644
--- a/sys/alpha/linux/linux_dummy.c
+++ b/sys/alpha/linux/linux_dummy.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_dummy.c,v 1.11 1999/08/25 11:19:01 marcel Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/linux/linux_genassym.c b/sys/alpha/linux/linux_genassym.c
index 99a88a510f6f9..5d962a6c04d40 100644
--- a/sys/alpha/linux/linux_genassym.c
+++ b/sys/alpha/linux/linux_genassym.c
@@ -1,4 +1,4 @@
-/* $Id: linux_genassym.c,v 1.8 1998/07/29 15:50:41 bde Exp $ */
+/* $FreeBSD$ */
 
 #include <sys/param.h>
 
diff --git a/sys/alpha/linux/linux_sysvec.c b/sys/alpha/linux/linux_sysvec.c
index 6c626bca01d8a..871ccfbed4c1e 100644
--- a/sys/alpha/linux/linux_sysvec.c
+++ b/sys/alpha/linux/linux_sysvec.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_sysvec.c,v 1.47 1999/04/28 01:04:20 luoqi Exp $
+ * $FreeBSD$
  */
 
 /* XXX we use functions that might not exist. */
diff --git a/sys/alpha/linux/syscalls.conf b/sys/alpha/linux/syscalls.conf
index d1e1425ed5a25..01e258801231d 100644
--- a/sys/alpha/linux/syscalls.conf
+++ b/sys/alpha/linux/syscalls.conf
@@ -1,4 +1,4 @@
-# $Id: syscalls.conf,v 1.3 1997/02/22 09:38:31 peter Exp $
+# $FreeBSD$
 sysnames="/dev/null"
 sysproto="linux_proto.h"
 sysproto_h=_LINUX_SYSPROTO_H_
diff --git a/sys/alpha/linux/syscalls.master b/sys/alpha/linux/syscalls.master
index 369ee6ffd3a9b..5e6ce0719a2a1 100644
--- a/sys/alpha/linux/syscalls.master
+++ b/sys/alpha/linux/syscalls.master
@@ -1,4 +1,4 @@
-	$Id: syscalls.master,v 1.22 1999/08/16 11:47:21 marcel Exp $
+ $FreeBSD$
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; System call name/number master file (or rather, slave, from LINUX).
diff --git a/sys/alpha/pci/apecs.c b/sys/alpha/pci/apecs.c
index 9d95446f6ed17..2f8a239971463 100644
--- a/sys/alpha/pci/apecs.c
+++ b/sys/alpha/pci/apecs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: apecs.c,v 1.8 1999/05/20 15:33:18 gallatin Exp $
+ * $FreeBSD$
  */
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/alpha/pci/apecs_pci.c b/sys/alpha/pci/apecs_pci.c
index 9181317834262..7a0573b2f3698 100644
--- a/sys/alpha/pci/apecs_pci.c
+++ b/sys/alpha/pci/apecs_pci.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: apecs_pci.c,v 1.2 1999/05/08 21:58:41 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/pci/apecsvar.h b/sys/alpha/pci/apecsvar.h
index 0104b4fbb2463..a5fa82e2511a6 100644
--- a/sys/alpha/pci/apecsvar.h
+++ b/sys/alpha/pci/apecsvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ciavar.h,v 1.1 1998/07/05 12:16:15 dfr Exp $
+ * $FreeBSD$
  */
 
 extern void apecs_init(void);
diff --git a/sys/alpha/pci/cia.c b/sys/alpha/pci/cia.c
index 43d6bc3184ed7..4251e06be6fd5 100644
--- a/sys/alpha/pci/cia.c
+++ b/sys/alpha/pci/cia.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cia.c,v 1.21 1999/07/29 16:44:22 gallatin Exp $
+ * $FreeBSD$
  */
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/alpha/pci/cia_pci.c b/sys/alpha/pci/cia_pci.c
index fdf0016d65ce7..73da41a852fc2 100644
--- a/sys/alpha/pci/cia_pci.c
+++ b/sys/alpha/pci/cia_pci.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cia_pci.c,v 1.2 1999/05/08 21:58:42 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/pci/ciareg.h b/sys/alpha/pci/ciareg.h
index edd79c72d8814..8da36a401ed15 100644
--- a/sys/alpha/pci/ciareg.h
+++ b/sys/alpha/pci/ciareg.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* $NetBSD: ciareg.h,v 1.22 1998/06/06 20:40:14 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/pci/ciavar.h b/sys/alpha/pci/ciavar.h
index 6f60c1519ae64..1e50032dec90e 100644
--- a/sys/alpha/pci/ciavar.h
+++ b/sys/alpha/pci/ciavar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 extern void cia_init(void);
diff --git a/sys/alpha/pci/lca.c b/sys/alpha/pci/lca.c
index d60a6646ab631..a510004ada976 100644
--- a/sys/alpha/pci/lca.c
+++ b/sys/alpha/pci/lca.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: lca.c,v 1.9 1999/05/20 15:33:23 gallatin Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/pci/lca_pci.c b/sys/alpha/pci/lca_pci.c
index f74840fa4a0ca..10a5a2aad0160 100644
--- a/sys/alpha/pci/lca_pci.c
+++ b/sys/alpha/pci/lca_pci.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: lca_pci.c,v 1.2 1999/05/08 21:58:43 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/pci/lcavar.h b/sys/alpha/pci/lcavar.h
index 53f036dea0071..1619539b5a2c7 100644
--- a/sys/alpha/pci/lcavar.h
+++ b/sys/alpha/pci/lcavar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 extern void lca_init(void);
diff --git a/sys/alpha/pci/pcibus.c b/sys/alpha/pci/pcibus.c
index bcde9ecb9b393..d49a57c60d4b2 100644
--- a/sys/alpha/pci/pcibus.c
+++ b/sys/alpha/pci/pcibus.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcibus.c,v 1.16 1999/07/01 22:48:30 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/alpha/pci/pcibus.h b/sys/alpha/pci/pcibus.h
index 38b51b772e9cf..27c5ffa00ef85 100644
--- a/sys/alpha/pci/pcibus.h
+++ b/sys/alpha/pci/pcibus.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: pcibus.h,v 1.1 1998/06/10 10:55:38 dfr Exp $
+ * $FreeBSD$
  */
 
 void pci_init_resources(void);
diff --git a/sys/alpha/pci/tsunami_pci.c b/sys/alpha/pci/tsunami_pci.c
index 1af09c1c82952..6f7af8820f1fb 100644
--- a/sys/alpha/pci/tsunami_pci.c
+++ b/sys/alpha/pci/tsunami_pci.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/alpha/pci/tsunamireg.h b/sys/alpha/pci/tsunamireg.h
index 64e4fcd2d6d5d..60b19a3bc65e3 100644
--- a/sys/alpha/pci/tsunamireg.h
+++ b/sys/alpha/pci/tsunamireg.h
@@ -1,4 +1,4 @@
-/* $Id: tsunamireg.h,v 1.1 1999/05/26 23:22:03 gallatin Exp $ */
+/* $FreeBSD$ */
 
 /*
  * 21271 Chipset registers and constants.
diff --git a/sys/alpha/pci/tsunamivar.h b/sys/alpha/pci/tsunamivar.h
index 0c34115624363..f82351f702f22 100644
--- a/sys/alpha/pci/tsunamivar.h
+++ b/sys/alpha/pci/tsunamivar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 extern void tsunami_init(void);
diff --git a/sys/alpha/tc/am7990.c b/sys/alpha/tc/am7990.c
index 41c17330b9ce0..a27d712d7a678 100644
--- a/sys/alpha/tc/am7990.c
+++ b/sys/alpha/tc/am7990.c
@@ -1,4 +1,4 @@
-/* $Id: am7990.c,v 1.3 1999/05/10 15:48:01 peter Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: am7990.c,v 1.43 1998/03/29 22:36:42 mycroft Exp $	*/
 
 /*-
diff --git a/sys/alpha/tc/am7990reg.h b/sys/alpha/tc/am7990reg.h
index 71d92d970a30c..dc3f56a520b53 100644
--- a/sys/alpha/tc/am7990reg.h
+++ b/sys/alpha/tc/am7990reg.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: am7990reg.h,v 1.4 1997/03/27 21:01:49 veego Exp $	*/
 
 /*-
diff --git a/sys/alpha/tc/am7990var.h b/sys/alpha/tc/am7990var.h
index cce6c252141cc..a5968fa8fd036 100644
--- a/sys/alpha/tc/am7990var.h
+++ b/sys/alpha/tc/am7990var.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: am7990var.h,v 1.18 1998/01/12 09:23:16 thorpej Exp $	*/
 
 /*-
diff --git a/sys/alpha/tc/ascvar.h b/sys/alpha/tc/ascvar.h
index 7132925214065..eafdeb3bd1ee4 100644
--- a/sys/alpha/tc/ascvar.h
+++ b/sys/alpha/tc/ascvar.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: ascvar.h,v 1.4 1997/11/28 18:23:40 mhitch Exp $	*/
 
 
diff --git a/sys/alpha/tc/esp.c b/sys/alpha/tc/esp.c
index 336e0fb8c1230..7bba66d2686ff 100644
--- a/sys/alpha/tc/esp.c
+++ b/sys/alpha/tc/esp.c
@@ -1,4 +1,4 @@
-/* $Id: esp.c,v 1.1 1998/08/20 08:27:10 dfr Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: esp.c,v 1.8.4.2 1996/09/10 17:28:16 cgd Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/espreg.h b/sys/alpha/tc/espreg.h
index 4f30d1cae082a..5c6ddb474eac9 100644
--- a/sys/alpha/tc/espreg.h
+++ b/sys/alpha/tc/espreg.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: espreg.h,v 1.2.4.1 1996/09/10 17:28:17 cgd Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/espvar.h b/sys/alpha/tc/espvar.h
index b64b774026855..72e26411efc09 100644
--- a/sys/alpha/tc/espvar.h
+++ b/sys/alpha/tc/espvar.h
@@ -1,4 +1,4 @@
-/* $Id: espvar.h,v 1.1 1998/08/20 08:27:10 dfr Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: espvar.h,v 1.3.4.1 1996/09/10 17:28:18 cgd Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/if_le_dec.c b/sys/alpha/tc/if_le_dec.c
index 4befcf474b2e0..b607dd082cb86 100644
--- a/sys/alpha/tc/if_le_dec.c
+++ b/sys/alpha/tc/if_le_dec.c
@@ -1,4 +1,4 @@
-/* $Id: if_le_dec.c,v 1.1 1998/08/20 08:27:10 dfr Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: if_le_dec.c,v 1.8 1997/07/22 04:32:21 jonathan Exp $	*/
 
 /*-
diff --git a/sys/alpha/tc/if_le_ioasic.c b/sys/alpha/tc/if_le_ioasic.c
index d672e77ee381c..2988db2f6a86e 100644
--- a/sys/alpha/tc/if_le_ioasic.c
+++ b/sys/alpha/tc/if_le_ioasic.c
@@ -1,4 +1,4 @@
-/* $Id: if_le_ioasic.c,v 1.1 1998/08/20 08:27:10 dfr Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: if_le_ioasic.c,v 1.10 1998/01/19 02:49:48 thorpej Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/if_levar.h b/sys/alpha/tc/if_levar.h
index 53f3f80c28b3d..9353ab2197542 100644
--- a/sys/alpha/tc/if_levar.h
+++ b/sys/alpha/tc/if_levar.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: if_levar.h,v 1.4 1997/03/15 18:12:07 is Exp $	*/
 
 /*-
diff --git a/sys/alpha/tc/ioasic.c b/sys/alpha/tc/ioasic.c
index 5771d222a60ae..d779e56315a90 100644
--- a/sys/alpha/tc/ioasic.c
+++ b/sys/alpha/tc/ioasic.c
@@ -1,4 +1,4 @@
-/* $Id: ioasic.c,v 1.4 1999/05/10 16:36:42 peter Exp $ */
+/* $FreeBSD$ */
 /* from $NetBSD: ioasic.c,v 1.19 1998/05/27 00:18:13 thorpej Exp $ */
 
 /*-
diff --git a/sys/alpha/tc/ioasicreg.h b/sys/alpha/tc/ioasicreg.h
index f7ca6d6dd2eee..d1f9db8a2c93d 100644
--- a/sys/alpha/tc/ioasicreg.h
+++ b/sys/alpha/tc/ioasicreg.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* $NetBSD: ioasicreg.h,v 1.2 1997/04/06 22:30:28 cgd Exp $ */
 
 /* 
diff --git a/sys/alpha/tc/ioasicvar.h b/sys/alpha/tc/ioasicvar.h
index cb48da0ef57ae..d7747a7546b6e 100644
--- a/sys/alpha/tc/ioasicvar.h
+++ b/sys/alpha/tc/ioasicvar.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: ioasicvar.h,v 1.5 1998/01/19 02:50:19 thorpej Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/mcclock_ioasic.c b/sys/alpha/tc/mcclock_ioasic.c
index 813d60d337268..adbede9ecb8e7 100644
--- a/sys/alpha/tc/mcclock_ioasic.c
+++ b/sys/alpha/tc/mcclock_ioasic.c
@@ -1,4 +1,4 @@
-/* $Id: mcclock_ioasic.c,v 1.1 1998/08/20 08:27:10 dfr Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: mcclock_ioasic.c,v 1.8 1997/09/02 13:20:14 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/tc/sticreg.h b/sys/alpha/tc/sticreg.h
index 31e30e5d3e8c8..7101582da71b4 100644
--- a/sys/alpha/tc/sticreg.h
+++ b/sys/alpha/tc/sticreg.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: sticreg.h,v 1.1 1997/11/08 07:27:50 jonathan Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/sticvar.h b/sys/alpha/tc/sticvar.h
index fd9ed46171189..be394eadded26 100644
--- a/sys/alpha/tc/sticvar.h
+++ b/sys/alpha/tc/sticvar.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: sticvar.h,v 1.1 1997/11/08 07:27:51 jonathan Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/tc.c b/sys/alpha/tc/tc.c
index b6b51db3e77bf..16d1552248930 100644
--- a/sys/alpha/tc/tc.c
+++ b/sys/alpha/tc/tc.c
@@ -1,4 +1,4 @@
-/* $Id: tc.c,v 1.5 1999/07/01 22:49:03 peter Exp $ */
+/* $FreeBSD$ */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
diff --git a/sys/alpha/tc/tcasic.c b/sys/alpha/tc/tcasic.c
index 683f3d368b93f..493b5ac0c0fbe 100644
--- a/sys/alpha/tc/tcasic.c
+++ b/sys/alpha/tc/tcasic.c
@@ -1,4 +1,4 @@
-/* $Id: tcasic.c,v 1.4 1999/05/10 15:54:58 peter Exp $ */
+/* $FreeBSD$ */
 /* from $NetBSD: tcasic.c,v 1.23 1998/05/14 00:01:31 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/tc/tcdevs.h b/sys/alpha/tc/tcdevs.h
index cdbae33005e2a..993fd39035720 100644
--- a/sys/alpha/tc/tcdevs.h
+++ b/sys/alpha/tc/tcdevs.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: tcdevs.h,v 1.12 1998/06/18 23:29:46 jonathan Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/tcdevs_data.h b/sys/alpha/tc/tcdevs_data.h
index 61c054c12fb88..214fcd0c88834 100644
--- a/sys/alpha/tc/tcdevs_data.h
+++ b/sys/alpha/tc/tcdevs_data.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: tcdevs_data.h,v 1.12 1998/06/18 23:29:46 jonathan Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/tcds.c b/sys/alpha/tc/tcds.c
index 6736fec74768c..b45737d7322de 100644
--- a/sys/alpha/tc/tcds.c
+++ b/sys/alpha/tc/tcds.c
@@ -1,4 +1,4 @@
-/* $Id: tcds.c,v 1.2 1999/05/08 21:58:50 dfr Exp $ */
+/* $FreeBSD$ */
 /* from $NetBSD: tcds.c,v 1.25 1998/05/26 23:43:05 thorpej Exp $ */
 
 /*-
diff --git a/sys/alpha/tc/tcds_dma.c b/sys/alpha/tc/tcds_dma.c
index d07811e799e83..f69251506b83f 100644
--- a/sys/alpha/tc/tcds_dma.c
+++ b/sys/alpha/tc/tcds_dma.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: tcds_dma.c,v 1.6.4.1 1996/09/10 17:28:19 cgd Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/tcdsreg.h b/sys/alpha/tc/tcdsreg.h
index 6c24281575cfa..da48eb802f1da 100644
--- a/sys/alpha/tc/tcdsreg.h
+++ b/sys/alpha/tc/tcdsreg.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: tcdsreg.h,v 1.1 1995/12/20 00:40:36 cgd Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/tcdsvar.h b/sys/alpha/tc/tcdsvar.h
index e1c15e8aaf769..72b631bfc387f 100644
--- a/sys/alpha/tc/tcdsvar.h
+++ b/sys/alpha/tc/tcdsvar.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: tcdsvar.h,v 1.3.4.1 1996/09/10 17:28:20 cgd Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/tcreg.h b/sys/alpha/tc/tcreg.h
index 80751688c7112..e64eaab955b0e 100644
--- a/sys/alpha/tc/tcreg.h
+++ b/sys/alpha/tc/tcreg.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: tcreg.h,v 1.1 1995/12/20 00:48:36 cgd Exp $	*/
 
 /*
diff --git a/sys/alpha/tc/tcvar.h b/sys/alpha/tc/tcvar.h
index 17e72096826ea..d23ad4a3e0117 100644
--- a/sys/alpha/tc/tcvar.h
+++ b/sys/alpha/tc/tcvar.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: tcvar.h,v 1.13 1998/05/22 21:15:48 thorpej Exp $	*/
 
 /*
diff --git a/sys/alpha/tlsb/dwlpx.c b/sys/alpha/tlsb/dwlpx.c
index 1df3e65a7e6ff..fbf21ec82074f 100644
--- a/sys/alpha/tlsb/dwlpx.c
+++ b/sys/alpha/tlsb/dwlpx.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: dwlpx.c,v 1.9 1999/05/08 21:58:51 dfr Exp $
+ * $FreeBSD$
  */
 
 #include "opt_simos.h"
diff --git a/sys/alpha/tlsb/dwlpxreg.h b/sys/alpha/tlsb/dwlpxreg.h
index 86a5686da3465..1eb95e9bd43ff 100644
--- a/sys/alpha/tlsb/dwlpxreg.h
+++ b/sys/alpha/tlsb/dwlpxreg.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* $NetBSD: dwlpxreg.h,v 1.9 1998/03/21 22:02:42 mjacob Exp $ */
 
 /*
diff --git a/sys/alpha/tlsb/gbusvar.h b/sys/alpha/tlsb/gbusvar.h
index 5ece6e0c8504e..cc0bd8e47835f 100644
--- a/sys/alpha/tlsb/gbusvar.h
+++ b/sys/alpha/tlsb/gbusvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: gbusvar.h,v 1.2 1998/06/10 20:40:59 dfr Exp $
+ * $FreeBSD$
  */
 /* $NetBSD: gbusvar.h,v 1.1 1998/05/13 02:50:29 thorpej Exp $ */
 
diff --git a/sys/alpha/tlsb/kftxx.c b/sys/alpha/tlsb/kftxx.c
index 889f97d575b51..0daf0aaae9238 100644
--- a/sys/alpha/tlsb/kftxx.c
+++ b/sys/alpha/tlsb/kftxx.c
@@ -1,4 +1,4 @@
-/* $Id: kftxx.c,v 1.5 1999/05/08 21:58:53 dfr Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: kftxx.c,v 1.9 1998/05/14 00:01:32 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/tlsb/kftxxreg.h b/sys/alpha/tlsb/kftxxreg.h
index dc2036b266e03..8ebeb3169732f 100644
--- a/sys/alpha/tlsb/kftxxreg.h
+++ b/sys/alpha/tlsb/kftxxreg.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* $NetBSD: kftxxreg.h,v 1.4 1997/06/04 01:47:15 cgd Exp $ */
 
 /*
diff --git a/sys/alpha/tlsb/kftxxvar.h b/sys/alpha/tlsb/kftxxvar.h
index 56168e62e8e18..2bdb24882dd28 100644
--- a/sys/alpha/tlsb/kftxxvar.h
+++ b/sys/alpha/tlsb/kftxxvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: kftxxvar.h,v 1.2 1998/06/10 20:48:03 dfr Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/alpha/tlsb/mcclock_tlsb.c b/sys/alpha/tlsb/mcclock_tlsb.c
index 535e3908711df..02759b9afb4e6 100644
--- a/sys/alpha/tlsb/mcclock_tlsb.c
+++ b/sys/alpha/tlsb/mcclock_tlsb.c
@@ -1,4 +1,4 @@
-/* $Id: mcclock_tlsb.c,v 1.4 1999/05/08 21:58:53 dfr Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: mcclock_tlsb.c,v 1.8 1998/05/13 02:50:29 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/tlsb/tlsbvar.h b/sys/alpha/tlsb/tlsbvar.h
index 6b72785216f66..f8690b4a40c92 100644
--- a/sys/alpha/tlsb/tlsbvar.h
+++ b/sys/alpha/tlsb/tlsbvar.h
@@ -1,4 +1,4 @@
-/* $Id: tlsbvar.h,v 1.1 1998/06/10 10:55:58 dfr Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: tlsbvar.h,v 1.5 1998/05/13 23:23:23 thorpej Exp $ */
 
 /*
diff --git a/sys/alpha/tlsb/zs_tlsb.c b/sys/alpha/tlsb/zs_tlsb.c
index 04ea7ee3d1c0b..37a94676f6761 100644
--- a/sys/alpha/tlsb/zs_tlsb.c
+++ b/sys/alpha/tlsb/zs_tlsb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: zs_tlsb.c,v 1.15 1999/07/29 01:02:45 mdodd Exp $
+ * $FreeBSD$
  */
 /*
  * This driver is a hopeless hack to get the SimOS console working.  A real
diff --git a/sys/alpha/tlsb/zsreg.h b/sys/alpha/tlsb/zsreg.h
index 36cda9348f348..f087a7ba55fea 100644
--- a/sys/alpha/tlsb/zsreg.h
+++ b/sys/alpha/tlsb/zsreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: zsreg.h,v 1.1 1998/06/10 10:56:01 dfr Exp $
+ * $FreeBSD$
  */
 
 #define ZSC_CHANNELA	0x80
diff --git a/sys/alpha/tlsb/zsvar.h b/sys/alpha/tlsb/zsvar.h
index 7ff35062d59bc..84701544274bc 100644
--- a/sys/alpha/tlsb/zsvar.h
+++ b/sys/alpha/tlsb/zsvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 int zs_cnattach(vm_offset_t base, vm_offset_t offset);
diff --git a/sys/amd64/Makefile b/sys/amd64/Makefile
index 28362ba9dc77e..c173c4fb1d714 100644
--- a/sys/amd64/Makefile
+++ b/sys/amd64/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.5 1998/05/31 22:40:49 steve Exp $
+# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/11/93
 
 # Makefile for i386 links, tags file
diff --git a/sys/amd64/amd64/amd64_mem.c b/sys/amd64/amd64/amd64_mem.c
index d971aa95f02e5..33342b92227c8 100644
--- a/sys/amd64/amd64/amd64_mem.c
+++ b/sys/amd64/amd64/amd64_mem.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: i686_mem.c,v 1.4 1999/07/20 06:58:51 msmith Exp $
+ * $FreeBSD$
  */
 
 #include "opt_smp.h"
diff --git a/sys/amd64/amd64/apic_vector.S b/sys/amd64/amd64/apic_vector.S
index 6a7bcf059a121..f484971eab2bb 100644
--- a/sys/amd64/amd64/apic_vector.S
+++ b/sys/amd64/amd64/apic_vector.S
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: apic_vector.s,v 1.43 1999/07/20 06:52:35 msmith Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/amd64/amd64/atomic.c b/sys/amd64/amd64/atomic.c
index d7a5c495d6dfd..c19ba9e027b2b 100644
--- a/sys/amd64/amd64/atomic.c
+++ b/sys/amd64/amd64/atomic.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /* This file creates publically callable functions to perform various
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index 4c5dbd34bb5ba..f678609719d0c 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$Id: autoconf.c,v 1.136 1999/08/22 23:49:00 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/amd64/bios.c b/sys/amd64/amd64/bios.c
index baf20187da6cf..5fc0a4296738a 100644
--- a/sys/amd64/amd64/bios.c
+++ b/sys/amd64/amd64/bios.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: bios.c,v 1.21 1999/08/25 06:56:36 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/amd64/busdma_machdep.c b/sys/amd64/amd64/busdma_machdep.c
index bebec68ceca15..c16333ced1100 100644
--- a/sys/amd64/amd64/busdma_machdep.c
+++ b/sys/amd64/amd64/busdma_machdep.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: busdma_machdep.c,v 1.13 1999/07/02 05:12:11 mjacob Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S
index fb6c1ff93688a..ee277419c3602 100644
--- a/sys/amd64/amd64/cpu_switch.S
+++ b/sys/amd64/amd64/cpu_switch.S
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.85 1999/07/10 15:27:55 bde Exp $
+ * $FreeBSD$
  */
 
 #include "npx.h"
diff --git a/sys/amd64/amd64/db_disasm.c b/sys/amd64/amd64/db_disasm.c
index b3b30b13f3f50..16e8106d5e738 100644
--- a/sys/amd64/amd64/db_disasm.c
+++ b/sys/amd64/amd64/db_disasm.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_disasm.c,v 1.21 1998/07/08 10:53:56 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/amd64/db_interface.c b/sys/amd64/amd64/db_interface.c
index 0ad6dfbfd56a9..cb7f228d671ad 100644
--- a/sys/amd64/amd64/db_interface.c
+++ b/sys/amd64/amd64/db_interface.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_interface.c,v 1.44 1999/04/28 01:03:17 luoqi Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/amd64/db_trace.c b/sys/amd64/amd64/db_trace.c
index 6a361a0052f91..074b4e639bcb2 100644
--- a/sys/amd64/amd64/db_trace.c
+++ b/sys/amd64/amd64/db_trace.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_trace.c,v 1.33 1999/01/28 01:59:50 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/amd64/amd64/elf_machdep.c b/sys/amd64/amd64/elf_machdep.c
index 2814f066e0f0a..51a2e77541f68 100644
--- a/sys/amd64/amd64/elf_machdep.c
+++ b/sys/amd64/amd64/elf_machdep.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $Id: elf_machdep.c,v 1.4 1998/12/07 21:58:18 archie Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S
index dce98e87e5b67..f19622475bb8e 100644
--- a/sys/amd64/amd64/exception.S
+++ b/sys/amd64/amd64/exception.S
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exception.s,v 1.62 1999/06/27 21:31:43 alc Exp $
+ * $FreeBSD$
  */
 
 #include "npx.h"
diff --git a/sys/amd64/amd64/exception.s b/sys/amd64/amd64/exception.s
index dce98e87e5b67..f19622475bb8e 100644
--- a/sys/amd64/amd64/exception.s
+++ b/sys/amd64/amd64/exception.s
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exception.s,v 1.62 1999/06/27 21:31:43 alc Exp $
+ * $FreeBSD$
  */
 
 #include "npx.h"
diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index a99b5674ea4b4..374c066170134 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.75 1999/07/26 05:47:31 cracauer Exp $
+ * $FreeBSD$
  */
 
 #include "npx.h"
diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c
index 9f17b0c7d6169..2df5182682169 100644
--- a/sys/amd64/amd64/genassym.c
+++ b/sys/amd64/amd64/genassym.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$Id: genassym.c,v 1.75 1999/07/29 08:33:00 peter Exp $
+ * $FreeBSD$
  */
 
 #include "opt_user_ldt.h"
diff --git a/sys/amd64/amd64/identcpu.c b/sys/amd64/amd64/identcpu.c
index ba53f4eab87b2..0f1e86d677372 100644
--- a/sys/amd64/amd64/identcpu.c
+++ b/sys/amd64/amd64/identcpu.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp
- *	$Id: identcpu.c,v 1.71 1999/07/06 13:23:56 peter Exp $
+ * $FreeBSD$
  */
 
 #include "opt_cpu.h"
diff --git a/sys/amd64/amd64/initcpu.c b/sys/amd64/amd64/initcpu.c
index a58caadce1b40..a56bb36d91a56 100644
--- a/sys/amd64/amd64/initcpu.c
+++ b/sys/amd64/amd64/initcpu.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *		$Id: initcpu.c,v 1.17 1999/01/16 13:41:33 kato Exp $
+ * $FreeBSD$
  */
 
 #include "opt_cpu.h"
diff --git a/sys/amd64/amd64/legacy.c b/sys/amd64/amd64/legacy.c
index 0c28185a347b8..22e98eda71063 100644
--- a/sys/amd64/amd64/legacy.c
+++ b/sys/amd64/amd64/legacy.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: nexus.c,v 1.15 1999/08/23 19:23:33 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S
index 95b55613bf47d..f2627266353c2 100644
--- a/sys/amd64/amd64/locore.S
+++ b/sys/amd64/amd64/locore.S
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$Id: locore.s,v 1.124 1999/06/18 14:32:13 bde Exp $
+ * $FreeBSD$
  *
  *		originally from: locore.s, by William F. Jolitz
  *
diff --git a/sys/amd64/amd64/locore.s b/sys/amd64/amd64/locore.s
index 95b55613bf47d..f2627266353c2 100644
--- a/sys/amd64/amd64/locore.s
+++ b/sys/amd64/amd64/locore.s
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$Id: locore.s,v 1.124 1999/06/18 14:32:13 bde Exp $
+ * $FreeBSD$
  *
  *		originally from: locore.s, by William F. Jolitz
  *
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index dfde63760a871..a3c33bfc293ab 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.358 1999/08/09 10:34:43 phk Exp $
+ * $FreeBSD$
  */
 
 #include "apm.h"
diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c
index c835a6ee2ccef..ab31e7095ea37 100644
--- a/sys/amd64/amd64/mem.c
+++ b/sys/amd64/amd64/mem.c
@@ -38,7 +38,7 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- *	$Id: mem.c,v 1.64 1999/08/23 20:58:38 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index 969cd0892495d..283ed1701a3cc 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.106 1999/07/20 06:52:26 msmith Exp $
+ * $FreeBSD$
  */
 
 #include "opt_smp.h"
diff --git a/sys/amd64/amd64/mpboot.S b/sys/amd64/amd64/mpboot.S
index 962bafcc77922..d21354e3c793b 100644
--- a/sys/amd64/amd64/mpboot.S
+++ b/sys/amd64/amd64/mpboot.S
@@ -31,7 +31,7 @@
  * mpboot.s:	FreeBSD machine support for the Intel MP Spec
  *		multiprocessor systems.
  *
- *	$Id: mpboot.s,v 1.10 1999/04/28 01:03:22 luoqi Exp $
+ * $FreeBSD$
  */
 
 #include <machine/asmacros.h>		/* miscellaneous asm macros */
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index 969cd0892495d..283ed1701a3cc 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.106 1999/07/20 06:52:26 msmith Exp $
+ * $FreeBSD$
  */
 
 #include "opt_smp.h"
diff --git a/sys/amd64/amd64/nexus.c b/sys/amd64/amd64/nexus.c
index 0c28185a347b8..22e98eda71063 100644
--- a/sys/amd64/amd64/nexus.c
+++ b/sys/amd64/amd64/nexus.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: nexus.c,v 1.15 1999/08/23 19:23:33 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 791060a03f8c5..6129ed86f48fe 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.245 1999/08/10 04:10:57 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/amd64/prof_machdep.c b/sys/amd64/amd64/prof_machdep.c
index 34479056ed73a..d934ee56eee6a 100644
--- a/sys/amd64/amd64/prof_machdep.c
+++ b/sys/amd64/amd64/prof_machdep.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: prof_machdep.c,v 1.12 1999/05/06 09:44:55 bde Exp $
+ * $FreeBSD$
  */
 
 #ifdef GUPROF
diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S
index 7093dbb86df45..ae99af947ab8d 100644
--- a/sys/amd64/amd64/support.S
+++ b/sys/amd64/amd64/support.S
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: support.s,v 1.62 1999/03/30 09:00:40 phk Exp $
+ * $FreeBSD$
  */
 
 #include "opt_smp.h"
diff --git a/sys/amd64/amd64/support.s b/sys/amd64/amd64/support.s
index 7093dbb86df45..ae99af947ab8d 100644
--- a/sys/amd64/amd64/support.s
+++ b/sys/amd64/amd64/support.s
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: support.s,v 1.62 1999/03/30 09:00:40 phk Exp $
+ * $FreeBSD$
  */
 
 #include "opt_smp.h"
diff --git a/sys/amd64/amd64/swtch.s b/sys/amd64/amd64/swtch.s
index fb6c1ff93688a..ee277419c3602 100644
--- a/sys/amd64/amd64/swtch.s
+++ b/sys/amd64/amd64/swtch.s
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.85 1999/07/10 15:27:55 bde Exp $
+ * $FreeBSD$
  */
 
 #include "npx.h"
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c
index 76b45ff8c3297..0f5930ca7a0ac 100644
--- a/sys/amd64/amd64/sys_machdep.c
+++ b/sys/amd64/amd64/sys_machdep.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sys_machdep.c	5.5 (Berkeley) 1/19/91
- *	$Id: sys_machdep.c,v 1.41 1999/04/28 01:03:25 luoqi Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index e717563e7ed57..5e3ed49ee48af 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.139 1999/06/18 14:32:16 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c
index 188e20bc0f474..8a3e1c93030c8 100644
--- a/sys/amd64/amd64/tsc.c
+++ b/sys/amd64/amd64/tsc.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.142 1999/07/29 01:20:47 green Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c
index 21bc706129cee..b907f27c034c1 100644
--- a/sys/amd64/amd64/vm_machdep.c
+++ b/sys/amd64/amd64/vm_machdep.c
@@ -38,7 +38,7 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.124 1999/07/22 06:04:01 alc Exp $
+ * $FreeBSD$
  */
 
 #include "npx.h"
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index f889546e112f9..2011cfea73e63 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -15,7 +15,7 @@
 # device lines is also present in the ./LINT configuration file. If you are
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.182 1999/08/15 09:54:56 phk Exp $
+# $FreeBSD$
 
 machine		i386
 cpu		I386_CPU
diff --git a/sys/amd64/include/apicreg.h b/sys/amd64/include/apicreg.h
index 55e44e0bec2ff..38c70709e7c2e 100644
--- a/sys/amd64/include/apicreg.h
+++ b/sys/amd64/include/apicreg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: apic.h,v 1.11 1997/08/04 17:31:24 fsmp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_APIC_H_
diff --git a/sys/amd64/include/asm.h b/sys/amd64/include/asm.h
index f1023173b3d46..7ac1243660249 100644
--- a/sys/amd64/include/asm.h
+++ b/sys/amd64/include/asm.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)DEFS.h	5.1 (Berkeley) 4/23/90
- *	$Id: asm.h,v 1.3 1997/04/15 14:06:34 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_ASM_H_
diff --git a/sys/amd64/include/asmacros.h b/sys/amd64/include/asmacros.h
index 00bdf7affe405..92b9e1a5d7007 100644
--- a/sys/amd64/include/asmacros.h
+++ b/sys/amd64/include/asmacros.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: asmacros.h,v 1.16 1997/04/22 06:55:32 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_ASMACROS_H_
diff --git a/sys/amd64/include/atomic.h b/sys/amd64/include/atomic.h
index e9f9403f61985..b3fd514cbc914 100644
--- a/sys/amd64/include/atomic.h
+++ b/sys/amd64/include/atomic.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: atomic.h,v 1.4 1999/07/23 23:45:19 alc Exp $
+ * $FreeBSD$
  */
 #ifndef _MACHINE_ATOMIC_H_
 #define _MACHINE_ATOMIC_H_
diff --git a/sys/amd64/include/bus.h b/sys/amd64/include/bus.h
index 28e80ba2b89aa..b6a9795a5ae5b 100644
--- a/sys/amd64/include/bus.h
+++ b/sys/amd64/include/bus.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.4 1998/09/29 09:06:00 bde Exp $ */
+/* $FreeBSD$ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
diff --git a/sys/amd64/include/bus_amd64.h b/sys/amd64/include/bus_amd64.h
index 28e80ba2b89aa..b6a9795a5ae5b 100644
--- a/sys/amd64/include/bus_amd64.h
+++ b/sys/amd64/include/bus_amd64.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.4 1998/09/29 09:06:00 bde Exp $ */
+/* $FreeBSD$ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
diff --git a/sys/amd64/include/bus_at386.h b/sys/amd64/include/bus_at386.h
index 28e80ba2b89aa..b6a9795a5ae5b 100644
--- a/sys/amd64/include/bus_at386.h
+++ b/sys/amd64/include/bus_at386.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.4 1998/09/29 09:06:00 bde Exp $ */
+/* $FreeBSD$ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
diff --git a/sys/amd64/include/bus_dma.h b/sys/amd64/include/bus_dma.h
index 28e80ba2b89aa..b6a9795a5ae5b 100644
--- a/sys/amd64/include/bus_dma.h
+++ b/sys/amd64/include/bus_dma.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.4 1998/09/29 09:06:00 bde Exp $ */
+/* $FreeBSD$ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
diff --git a/sys/amd64/include/bus_memio.h b/sys/amd64/include/bus_memio.h
index ee58d5a24ef22..3533a671fe8d2 100644
--- a/sys/amd64/include/bus_memio.h
+++ b/sys/amd64/include/bus_memio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _I386_BUS_MEMIO_H_
diff --git a/sys/amd64/include/bus_pio.h b/sys/amd64/include/bus_pio.h
index 4eb051e181909..8742dd195e0be 100644
--- a/sys/amd64/include/bus_pio.h
+++ b/sys/amd64/include/bus_pio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _I386_BUS_PIO_H_
diff --git a/sys/amd64/include/clock.h b/sys/amd64/include/clock.h
index 03e2d79e20f63..f5c654a6a64fb 100644
--- a/sys/amd64/include/clock.h
+++ b/sys/amd64/include/clock.h
@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- *	$Id: clock.h,v 1.34 1998/03/05 21:45:42 tegge Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_CLOCK_H_
diff --git a/sys/amd64/include/cpu.h b/sys/amd64/include/cpu.h
index d3e4ad47b9f09..4a2fe79f41ad6 100644
--- a/sys/amd64/include/cpu.h
+++ b/sys/amd64/include/cpu.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cpu.h	5.4 (Berkeley) 5/9/91
- *	$Id: cpu.h,v 1.39 1999/04/23 20:22:44 dt Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_CPU_H_
diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h
index 9c72d0db5327f..9618b252019f4 100644
--- a/sys/amd64/include/cpufunc.h
+++ b/sys/amd64/include/cpufunc.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cpufunc.h,v 1.89 1999/08/19 00:32:48 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/include/cputypes.h b/sys/amd64/include/cputypes.h
index ece2509927abc..93e01e26287dd 100644
--- a/sys/amd64/include/cputypes.h
+++ b/sys/amd64/include/cputypes.h
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cputypes.h,v 1.11 1998/05/22 00:03:23 des Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_CPUTYPES_H_
diff --git a/sys/amd64/include/db_machdep.h b/sys/amd64/include/db_machdep.h
index aaa32f66661fa..d5022d81e92da 100644
--- a/sys/amd64/include/db_machdep.h
+++ b/sys/amd64/include/db_machdep.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  *
- *	$Id: db_machdep.h,v 1.12 1997/02/22 09:34:24 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_DB_MACHDEP_H_
diff --git a/sys/amd64/include/elf.h b/sys/amd64/include/elf.h
index ac0cce3ee0e9c..756c08c020426 100644
--- a/sys/amd64/include/elf.h
+++ b/sys/amd64/include/elf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: elf.h,v 1.6 1999/02/07 23:49:55 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_ELF_H_
diff --git a/sys/amd64/include/exec.h b/sys/amd64/include/exec.h
index 7670fd1cee1ac..c233b09655b2d 100644
--- a/sys/amd64/include/exec.h
+++ b/sys/amd64/include/exec.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.1 (Berkeley) 6/11/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_EXEC_H_
diff --git a/sys/amd64/include/float.h b/sys/amd64/include/float.h
index a0296ecc8c05a..5cdbc97f7d4b4 100644
--- a/sys/amd64/include/float.h
+++ b/sys/amd64/include/float.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)float.h	7.1 (Berkeley) 5/8/90
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_FLOAT_H_
diff --git a/sys/amd64/include/floatingpoint.h b/sys/amd64/include/floatingpoint.h
index cd2561f8b9d12..c3e674f7f30ce 100644
--- a/sys/amd64/include/floatingpoint.h
+++ b/sys/amd64/include/floatingpoint.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#) floatingpoint.h	1.0 (Berkeley) 9/23/93
- *	$Id: floatingpoint.h,v 1.8 1997/02/22 09:34:37 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _FLOATINGPOINT_H_
diff --git a/sys/amd64/include/fpu.h b/sys/amd64/include/fpu.h
index 10384c6ebf9ba..2e7a31d25082e 100644
--- a/sys/amd64/include/fpu.h
+++ b/sys/amd64/include/fpu.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.h	5.3 (Berkeley) 1/18/91
- *	$Id: npx.h,v 1.14 1997/07/20 11:06:44 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/include/frame.h b/sys/amd64/include/frame.h
index f339f01c43c10..b212d6c7b77fc 100644
--- a/sys/amd64/include/frame.h
+++ b/sys/amd64/include/frame.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)frame.h	5.2 (Berkeley) 1/18/91
- *	$Id: frame.h,v 1.17 1999/05/11 16:29:01 luoqi Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_FRAME_H_
diff --git a/sys/amd64/include/ieeefp.h b/sys/amd64/include/ieeefp.h
index ab4d529ea94cb..3c9c49ddda34c 100644
--- a/sys/amd64/include/ieeefp.h
+++ b/sys/amd64/include/ieeefp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * 	from: @(#) ieeefp.h 	1.0 (Berkeley) 9/23/93
- *	$Id: ieeefp.h,v 1.5 1997/02/22 09:34:41 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/include/md_var.h b/sys/amd64/include/md_var.h
index 491eb46b024ab..755e1e72cce26 100644
--- a/sys/amd64/include/md_var.h
+++ b/sys/amd64/include/md_var.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: md_var.h,v 1.29 1999/04/28 01:04:02 luoqi Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_MD_VAR_H_
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index 969cd0892495d..283ed1701a3cc 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.106 1999/07/20 06:52:26 msmith Exp $
+ * $FreeBSD$
  */
 
 #include "opt_smp.h"
diff --git a/sys/amd64/include/npx.h b/sys/amd64/include/npx.h
index 10384c6ebf9ba..2e7a31d25082e 100644
--- a/sys/amd64/include/npx.h
+++ b/sys/amd64/include/npx.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.h	5.3 (Berkeley) 1/18/91
- *	$Id: npx.h,v 1.14 1997/07/20 11:06:44 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/include/pc/bios.h b/sys/amd64/include/pc/bios.h
index 1ea2f9273191f..3a317863812fa 100644
--- a/sys/amd64/include/pc/bios.h
+++ b/sys/amd64/include/pc/bios.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: bios.h,v 1.5 1999/08/18 02:20:04 msmith Exp $
+ * $FreeBSD$
  */
 
 /* 
diff --git a/sys/amd64/include/pc/display.h b/sys/amd64/include/pc/display.h
index 9e64a3f13307c..cd2d5ff35b73f 100644
--- a/sys/amd64/include/pc/display.h
+++ b/sys/amd64/include/pc/display.h
@@ -1,7 +1,7 @@
 /*
  * IBM PC display definitions
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /* Color attributes for foreground text */
diff --git a/sys/amd64/include/pcb.h b/sys/amd64/include/pcb.h
index 5cee924dd9ff2..ed3044cc4d6a6 100644
--- a/sys/amd64/include/pcb.h
+++ b/sys/amd64/include/pcb.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pcb.h	5.10 (Berkeley) 5/12/91
- *	$Id: pcb.h,v 1.28 1999/06/01 18:20:06 jlemon Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_PCB_H_
diff --git a/sys/amd64/include/pcb_ext.h b/sys/amd64/include/pcb_ext.h
index 36d07e9e8cecd..154cf949ba0bb 100644
--- a/sys/amd64/include/pcb_ext.h
+++ b/sys/amd64/include/pcb_ext.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _I386_PCB_EXT_H_
diff --git a/sys/amd64/include/pci_cfgreg.h b/sys/amd64/include/pci_cfgreg.h
index 44556e7731add..34b3fc54aaa33 100644
--- a/sys/amd64/include/pci_cfgreg.h
+++ b/sys/amd64/include/pci_cfgreg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/amd64/include/pcpu.h b/sys/amd64/include/pcpu.h
index c02009b834320..28336d7085343 100644
--- a/sys/amd64/include/pcpu.h
+++ b/sys/amd64/include/pcpu.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: globaldata.h,v 1.9 1999/05/12 21:39:00 luoqi Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h
index fd55bdcb2efa0..b9f3f745a4e70 100644
--- a/sys/amd64/include/pmap.h
+++ b/sys/amd64/include/pmap.h
@@ -42,7 +42,7 @@
  *
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- * 	$Id: pmap.h,v 1.60 1999/04/02 17:59:49 alc Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PMAP_H_
diff --git a/sys/amd64/include/proc.h b/sys/amd64/include/proc.h
index ae6cd6337bc33..bc2679e385c3a 100644
--- a/sys/amd64/include/proc.h
+++ b/sys/amd64/include/proc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)proc.h	7.1 (Berkeley) 5/15/91
- *	$Id: proc.h,v 1.8 1997/05/07 19:55:13 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PROC_H_
diff --git a/sys/amd64/include/profile.h b/sys/amd64/include/profile.h
index e034e611e0695..1d2b6009f52e4 100644
--- a/sys/amd64/include/profile.h
+++ b/sys/amd64/include/profile.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)profile.h	8.1 (Berkeley) 6/11/93
- * $Id: profile.h,v 1.17 1998/07/14 05:09:43 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PROFILE_H_
diff --git a/sys/amd64/include/psl.h b/sys/amd64/include/psl.h
index 5f1733587f8e6..6a7e233a84082 100644
--- a/sys/amd64/include/psl.h
+++ b/sys/amd64/include/psl.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)psl.h	5.2 (Berkeley) 1/18/91
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PSL_H_
diff --git a/sys/amd64/include/ptrace.h b/sys/amd64/include/ptrace.h
index 2c43a2eef8d4e..55a26fd636ad3 100644
--- a/sys/amd64/include/ptrace.h
+++ b/sys/amd64/include/ptrace.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $Id: ptrace.h,v 1.6 1998/05/19 00:00:12 tegge Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PTRACE_H_
diff --git a/sys/amd64/include/reg.h b/sys/amd64/include/reg.h
index 994bdfda03606..1f541c7b30d04 100644
--- a/sys/amd64/include/reg.h
+++ b/sys/amd64/include/reg.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)reg.h	5.5 (Berkeley) 1/18/91
- *	$Id: reg.h,v 1.18 1999/04/28 01:04:06 luoqi Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_REG_H_
diff --git a/sys/amd64/include/reloc.h b/sys/amd64/include/reloc.h
index ead0334ee2213..ef4b8dbc3e8c4 100644
--- a/sys/amd64/include/reloc.h
+++ b/sys/amd64/include/reloc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)reloc.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _I386_MACHINE_RELOC_H_
diff --git a/sys/amd64/include/segments.h b/sys/amd64/include/segments.h
index 1a6e20d91af8d..d043d8b5a1131 100644
--- a/sys/amd64/include/segments.h
+++ b/sys/amd64/include/segments.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)segments.h	7.1 (Berkeley) 5/9/91
- *	$Id: segments.h,v 1.21 1999/07/29 01:49:19 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_SEGMENTS_H_
diff --git a/sys/amd64/include/setjmp.h b/sys/amd64/include/setjmp.h
index c0337c06ce6d3..173ea2d92f8c1 100644
--- a/sys/amd64/include/setjmp.h
+++ b/sys/amd64/include/setjmp.h
@@ -1,4 +1,4 @@
-/* $Id: setjmp.h,v 1.1 1998/01/10 23:04:51 jb Exp $ */
+/* $FreeBSD$ */
 /*
  * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
  * All rights reserved.
diff --git a/sys/amd64/include/signal.h b/sys/amd64/include/signal.h
index 51dc1960901e2..deaa06ca79237 100644
--- a/sys/amd64/include/signal.h
+++ b/sys/amd64/include/signal.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.1 (Berkeley) 6/11/93
- * $Id: signal.h,v 1.7 1997/02/22 09:35:12 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_SIGNAL_H_
diff --git a/sys/amd64/include/smp.h b/sys/amd64/include/smp.h
index c425db6f7d32b..0524d76b6fbe7 100644
--- a/sys/amd64/include/smp.h
+++ b/sys/amd64/include/smp.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: smp.h,v 1.45 1999/04/28 01:04:07 luoqi Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/amd64/include/specialreg.h b/sys/amd64/include/specialreg.h
index f6e04fa98cbcd..d95f9331f6236 100644
--- a/sys/amd64/include/specialreg.h
+++ b/sys/amd64/include/specialreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)specialreg.h	7.1 (Berkeley) 5/9/91
- *	$Id: specialreg.h,v 1.16 1998/10/06 13:16:26 kato Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_SPECIALREG_H_
diff --git a/sys/amd64/include/sysarch.h b/sys/amd64/include/sysarch.h
index a9248389acd25..009c7810259a3 100644
--- a/sys/amd64/include/sysarch.h
+++ b/sys/amd64/include/sysarch.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sysarch.h,v 1.9 1998/07/28 03:33:27 jlemon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/include/trap.h b/sys/amd64/include/trap.h
index 96928d189962f..6cc059a1e5840 100644
--- a/sys/amd64/include/trap.h
+++ b/sys/amd64/include/trap.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.h	5.4 (Berkeley) 5/9/91
- *	$Id: trap.h,v 1.8 1999/07/25 13:16:08 cracauer Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_TRAP_H_
diff --git a/sys/amd64/include/tss.h b/sys/amd64/include/tss.h
index 636133a9a8706..2003a66609b48 100644
--- a/sys/amd64/include/tss.h
+++ b/sys/amd64/include/tss.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)tss.h	5.4 (Berkeley) 1/18/91
- *	$Id: tss.h,v 1.8 1997/02/22 09:35:20 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_TSS_H_
diff --git a/sys/amd64/include/varargs.h b/sys/amd64/include/varargs.h
index 5661462e11f4f..d1d4ed0c09060 100644
--- a/sys/amd64/include/varargs.h
+++ b/sys/amd64/include/varargs.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)varargs.h	8.2 (Berkeley) 3/22/94
- * $Id: varargs.h,v 1.6 1997/02/28 07:12:34 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _VARARGS_H_
diff --git a/sys/amd64/include/vmparam.h b/sys/amd64/include/vmparam.h
index 9ec54e2d34afc..0a5847dd5ff63 100644
--- a/sys/amd64/include/vmparam.h
+++ b/sys/amd64/include/vmparam.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vmparam.h	5.9 (Berkeley) 5/12/91
- *	$Id: vmparam.h,v 1.30 1998/06/12 09:10:22 dg Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/amd64/isa/atpic_vector.S b/sys/amd64/isa/atpic_vector.S
index cbb8b5ea49b9f..24ce97b666b97 100644
--- a/sys/amd64/isa/atpic_vector.S
+++ b/sys/amd64/isa/atpic_vector.S
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: icu_vector.s,v 1.12 1999/05/28 14:08:59 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c
index 188e20bc0f474..8a3e1c93030c8 100644
--- a/sys/amd64/isa/clock.c
+++ b/sys/amd64/isa/clock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.142 1999/07/29 01:20:47 green Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/isa/icu.h b/sys/amd64/isa/icu.h
index cfe4dceb08734..14e8d14aa9bef 100644
--- a/sys/amd64/isa/icu.h
+++ b/sys/amd64/isa/icu.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)icu.h	5.6 (Berkeley) 5/9/91
- *	$Id: icu.h,v 1.15 1997/07/22 20:12:05 fsmp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/isa/icu_ipl.S b/sys/amd64/isa/icu_ipl.S
index 0f3a3caeaa33e..34753583a41e5 100644
--- a/sys/amd64/isa/icu_ipl.S
+++ b/sys/amd64/isa/icu_ipl.S
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: icu_ipl.s,v 1.4 1998/08/11 15:08:12 bde Exp $
+ * $FreeBSD$
  */
 
 	.data
diff --git a/sys/amd64/isa/icu_ipl.s b/sys/amd64/isa/icu_ipl.s
index 0f3a3caeaa33e..34753583a41e5 100644
--- a/sys/amd64/isa/icu_ipl.s
+++ b/sys/amd64/isa/icu_ipl.s
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: icu_ipl.s,v 1.4 1998/08/11 15:08:12 bde Exp $
+ * $FreeBSD$
  */
 
 	.data
diff --git a/sys/amd64/isa/icu_vector.S b/sys/amd64/isa/icu_vector.S
index cbb8b5ea49b9f..24ce97b666b97 100644
--- a/sys/amd64/isa/icu_vector.S
+++ b/sys/amd64/isa/icu_vector.S
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: icu_vector.s,v 1.12 1999/05/28 14:08:59 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/isa/icu_vector.s b/sys/amd64/isa/icu_vector.s
index cbb8b5ea49b9f..24ce97b666b97 100644
--- a/sys/amd64/isa/icu_vector.s
+++ b/sys/amd64/isa/icu_vector.s
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: icu_vector.s,v 1.12 1999/05/28 14:08:59 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/isa/intr_machdep.c b/sys/amd64/isa/intr_machdep.c
index 3a214a99522a6..8bdb4b6d72d4a 100644
--- a/sys/amd64/isa/intr_machdep.c
+++ b/sys/amd64/isa/intr_machdep.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: intr_machdep.c,v 1.22 1999/05/22 09:39:31 peter Exp $
+ * $FreeBSD$
  */
 /*
  * This file contains an aggregated module marked:
@@ -506,7 +506,7 @@ icu_unset(intr, handler)
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: intr_machdep.c,v 1.22 1999/05/22 09:39:31 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/amd64/isa/intr_machdep.h b/sys/amd64/isa/intr_machdep.h
index 06593cf359f44..adea3037caa19 100644
--- a/sys/amd64/isa/intr_machdep.h
+++ b/sys/amd64/isa/intr_machdep.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: intr_machdep.h,v 1.15 1999/06/03 20:41:00 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_ISA_INTR_MACHDEP_H_
diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c
index 8e153a71c62be..f87d9816f0716 100644
--- a/sys/amd64/isa/isa.c
+++ b/sys/amd64/isa/isa.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: isa.c,v 1.127 1999/05/22 15:18:12 dfr Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/isa/isa.h b/sys/amd64/isa/isa.h
index ea25f20604ee3..cc66da9be0454 100644
--- a/sys/amd64/isa/isa.h
+++ b/sys/amd64/isa/isa.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- *	$Id: isa.h,v 1.21 1997/02/22 09:36:41 peter Exp $
+ * $FreeBSD$
  */
 
 #ifdef PC98
diff --git a/sys/amd64/isa/isa_dma.c b/sys/amd64/isa/isa_dma.c
index 7855aaa89fa18..698c67004a7e4 100644
--- a/sys/amd64/isa/isa_dma.c
+++ b/sys/amd64/isa/isa_dma.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa_dma.c,v 1.2 1999/04/21 07:26:28 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/isa/isa_dma.h b/sys/amd64/isa/isa_dma.h
index 3fe234c3422cb..15f8b3d804dae 100644
--- a/sys/amd64/isa/isa_dma.h
+++ b/sys/amd64/isa/isa_dma.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa_device.h	7.1 (Berkeley) 5/9/91
- *	$Id: isa_device.h,v 1.57 1999/01/17 06:33:43 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_ISA_ISA_DMA_H_
diff --git a/sys/amd64/isa/nmi.c b/sys/amd64/isa/nmi.c
index 3a214a99522a6..8bdb4b6d72d4a 100644
--- a/sys/amd64/isa/nmi.c
+++ b/sys/amd64/isa/nmi.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: intr_machdep.c,v 1.22 1999/05/22 09:39:31 peter Exp $
+ * $FreeBSD$
  */
 /*
  * This file contains an aggregated module marked:
@@ -506,7 +506,7 @@ icu_unset(intr, handler)
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: intr_machdep.c,v 1.22 1999/05/22 09:39:31 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c
index a99b5674ea4b4..374c066170134 100644
--- a/sys/amd64/isa/npx.c
+++ b/sys/amd64/isa/npx.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.75 1999/07/26 05:47:31 cracauer Exp $
+ * $FreeBSD$
  */
 
 #include "npx.h"
diff --git a/sys/amd64/isa/timerreg.h b/sys/amd64/isa/timerreg.h
index ff27bacc24a46..0bfd7fc8cd630 100644
--- a/sys/amd64/isa/timerreg.h
+++ b/sys/amd64/isa/timerreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: Header: timerreg.h,v 1.2 93/02/28 15:08:58 mccanne Exp
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/isa/vector.S b/sys/amd64/isa/vector.S
index 608f13586c3b4..5447a90126a03 100644
--- a/sys/amd64/isa/vector.S
+++ b/sys/amd64/isa/vector.S
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: vector.s,v 1.30 1997/05/26 17:58:27 fsmp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/isa/vector.s b/sys/amd64/isa/vector.s
index 608f13586c3b4..5447a90126a03 100644
--- a/sys/amd64/isa/vector.s
+++ b/sys/amd64/isa/vector.s
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: vector.s,v 1.30 1997/05/26 17:58:27 fsmp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/amd64/pci/pci_bus.c b/sys/amd64/pci/pci_bus.c
index 08cba7f52e067..741baa907f632 100644
--- a/sys/amd64/pci/pci_bus.c
+++ b/sys/amd64/pci/pci_bus.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcibus.c,v 1.46 1999/08/10 09:22:21 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c
index 08cba7f52e067..741baa907f632 100644
--- a/sys/amd64/pci/pci_cfgreg.c
+++ b/sys/amd64/pci/pci_cfgreg.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcibus.c,v 1.46 1999/08/10 09:22:21 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/boot/alpha/Makefile b/sys/boot/alpha/Makefile
index 81dec0372be71..a36f2cf53d61f 100644
--- a/sys/boot/alpha/Makefile
+++ b/sys/boot/alpha/Makefile
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 
 SUBDIR=		libalpha
 SUBDIR+=	boot1 boot2 netboot
diff --git a/sys/boot/alpha/boot1/boot1.c b/sys/boot/alpha/boot1/boot1.c
index 7346c5b8085a2..e3f52a910abfc 100644
--- a/sys/boot/alpha/boot1/boot1.c
+++ b/sys/boot/alpha/boot1/boot1.c
@@ -1,5 +1,5 @@
 /*
- * $Id: boot1.c,v 1.3 1998/10/18 19:05:07 dfr Exp $
+ * $FreeBSD$
  * From	$NetBSD: bootxx.c,v 1.4 1997/09/06 14:08:29 drochner Exp $ 
  */
 
diff --git a/sys/boot/alpha/boot1/sys.c b/sys/boot/alpha/boot1/sys.c
index 79f17025a9599..4766c9a02c35f 100644
--- a/sys/boot/alpha/boot1/sys.c
+++ b/sys/boot/alpha/boot1/sys.c
@@ -25,7 +25,7 @@
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:34  rpd
  *	fromL Id: sys.c,v 1.21 1997/06/09 05:10:56 bde Exp
- *	$Id: sys.c,v 1.1.1.1 1998/08/21 03:17:41 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/alpha/boot2/conf.c b/sys/boot/alpha/boot2/conf.c
index e4f439b819000..a105c7f18144e 100644
--- a/sys/boot/alpha/boot2/conf.c
+++ b/sys/boot/alpha/boot2/conf.c
@@ -1,5 +1,5 @@
 /*
- * $Id: conf.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $
+ * $FreeBSD$
  * From	$NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $	 
  */
 
diff --git a/sys/boot/alpha/boot2/version b/sys/boot/alpha/boot2/version
index 6346f50d0a0f3..bc9aa00ed9ab1 100644
--- a/sys/boot/alpha/boot2/version
+++ b/sys/boot/alpha/boot2/version
@@ -1,4 +1,4 @@
-$Id$
+$FreeBSD$
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
diff --git a/sys/boot/alpha/common/main.c b/sys/boot/alpha/common/main.c
index 41400240b26eb..b9c5ff7365837 100644
--- a/sys/boot/alpha/common/main.c
+++ b/sys/boot/alpha/common/main.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: main.c,v 1.8 1998/10/31 17:12:32 dfr Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/boot/alpha/common/setdef0.c b/sys/boot/alpha/common/setdef0.c
index b41276d76e726..49f662ae1d6ca 100644
--- a/sys/boot/alpha/common/setdef0.c
+++ b/sys/boot/alpha/common/setdef0.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: setdef0.c,v 1.1 1998/06/10 10:53:12 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifdef __ELF__
diff --git a/sys/boot/alpha/common/setdef1.c b/sys/boot/alpha/common/setdef1.c
index 659618a83cc5e..13668f08cefc6 100644
--- a/sys/boot/alpha/common/setdef1.c
+++ b/sys/boot/alpha/common/setdef1.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: setdef1.c,v 1.1 1998/06/10 10:53:13 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifdef __ELF__
diff --git a/sys/boot/alpha/libalpha/Makefile b/sys/boot/alpha/libalpha/Makefile
index 4928647b75489..fe642eb1336f2 100644
--- a/sys/boot/alpha/libalpha/Makefile
+++ b/sys/boot/alpha/libalpha/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 1998/10/14 09:53:25 peter Exp $
+# $FreeBSD$
 
 LIB=		alpha
 NOPIC=		true
diff --git a/sys/boot/alpha/libalpha/OSFpal.c b/sys/boot/alpha/libalpha/OSFpal.c
index b77ee12e3ab5b..870296b65479f 100644
--- a/sys/boot/alpha/libalpha/OSFpal.c
+++ b/sys/boot/alpha/libalpha/OSFpal.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $FreeBSD$
  * From	$NetBSD: OSFpal.c,v 1.5 1998/06/24 01:33:19 ross Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/alpha_copy.c b/sys/boot/alpha/libalpha/alpha_copy.c
index 196915c1eb23e..95b6cba677e4d 100644
--- a/sys/boot/alpha/libalpha/alpha_copy.c
+++ b/sys/boot/alpha/libalpha/alpha_copy.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alpha_copy.c,v 1.2 1998/09/03 02:10:07 msmith Exp $
+ * $FreeBSD$
  */
 /*
  * MD primitives supporting placement of module data 
diff --git a/sys/boot/alpha/libalpha/alpha_module.c b/sys/boot/alpha/libalpha/alpha_module.c
index afa065f5bd04e..4ac21d42242d8 100644
--- a/sys/boot/alpha/libalpha/alpha_module.c
+++ b/sys/boot/alpha/libalpha/alpha_module.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alpha_module.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/alpha/libalpha/bbinfo.h b/sys/boot/alpha/libalpha/bbinfo.h
index 5529035ff4388..94aa4bbff07f7 100644
--- a/sys/boot/alpha/libalpha/bbinfo.h
+++ b/sys/boot/alpha/libalpha/bbinfo.h
@@ -1,5 +1,5 @@
 /* 
- * $Id$
+ * $FreeBSD$
  * From $NetBSD: bbinfo.h,v 1.2 1997/04/06 08:40:57 cgd Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/bootinfo.c b/sys/boot/alpha/libalpha/bootinfo.c
index fa0842b591690..5513583bbb6ba 100644
--- a/sys/boot/alpha/libalpha/bootinfo.c
+++ b/sys/boot/alpha/libalpha/bootinfo.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bootinfo.c,v 1.6 1999/03/20 14:13:09 dcs Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/alpha/libalpha/common.h b/sys/boot/alpha/libalpha/common.h
index 8acd3f93e47b1..ff184763dd849 100644
--- a/sys/boot/alpha/libalpha/common.h
+++ b/sys/boot/alpha/libalpha/common.h
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $FreeBSD$
  * From: $NetBSD: common.h,v 1.2 1998/01/05 07:02:48 perry Exp $	
  */
 
diff --git a/sys/boot/alpha/libalpha/delay.c b/sys/boot/alpha/libalpha/delay.c
index a7621b76bbb1f..faaf9829c3db9 100644
--- a/sys/boot/alpha/libalpha/delay.c
+++ b/sys/boot/alpha/libalpha/delay.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/alpha/libalpha/devicename.c b/sys/boot/alpha/libalpha/devicename.c
index dcd07ede1fcbe..d8ee1133299e2 100644
--- a/sys/boot/alpha/libalpha/devicename.c
+++ b/sys/boot/alpha/libalpha/devicename.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: devicename.c,v 1.2 1998/08/22 10:31:01 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/alpha/libalpha/elf_freebsd.c b/sys/boot/alpha/libalpha/elf_freebsd.c
index 0958b956325c8..4efd603e3d647 100644
--- a/sys/boot/alpha/libalpha/elf_freebsd.c
+++ b/sys/boot/alpha/libalpha/elf_freebsd.c
@@ -1,4 +1,4 @@
-/* $Id: elf_freebsd.c,v 1.6 1998/10/15 21:55:58 dfr Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */
 
 /*-
diff --git a/sys/boot/alpha/libalpha/getsecs.c b/sys/boot/alpha/libalpha/getsecs.c
index f234a37256ca0..13f1e53e1bf30 100644
--- a/sys/boot/alpha/libalpha/getsecs.c
+++ b/sys/boot/alpha/libalpha/getsecs.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $FreeBSD$
  * From:	$NetBSD: getsecs.c,v 1.5 1998/01/05 07:02:49 perry Exp $	
  */
 
diff --git a/sys/boot/alpha/libalpha/libalpha.h b/sys/boot/alpha/libalpha/libalpha.h
index 79b231a5c4b1f..8e1dd71e09f00 100644
--- a/sys/boot/alpha/libalpha/libalpha.h
+++ b/sys/boot/alpha/libalpha/libalpha.h
@@ -1,4 +1,4 @@
-/* $Id: libalpha.h,v 1.3 1998/09/20 21:46:19 dfr Exp $ */
+/* $FreeBSD$ */
 
 /*
  * Copyright (c) 1996
diff --git a/sys/boot/alpha/libalpha/pal.S b/sys/boot/alpha/libalpha/pal.S
index c33f317d52be3..d411318b54aeb 100644
--- a/sys/boot/alpha/libalpha/pal.S
+++ b/sys/boot/alpha/libalpha/pal.S
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $FreeBSD$
  * From: $NetBSD: pal.s,v 1.12 1998/02/27 03:44:53 thorpej Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/prom.c b/sys/boot/alpha/libalpha/prom.c
index 380326ccd0ec4..e32d43d3b66fc 100644
--- a/sys/boot/alpha/libalpha/prom.c
+++ b/sys/boot/alpha/libalpha/prom.c
@@ -1,4 +1,4 @@
-/* $Id: prom.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: prom.c,v 1.3 1997/09/06 14:03:58 drochner Exp $ */
 
 /*  
diff --git a/sys/boot/alpha/libalpha/prom_disp.S b/sys/boot/alpha/libalpha/prom_disp.S
index 6d5e0874bdb54..184f1d3c9f00e 100644
--- a/sys/boot/alpha/libalpha/prom_disp.S
+++ b/sys/boot/alpha/libalpha/prom_disp.S
@@ -1,5 +1,5 @@
 /* 
- * $Id$ 
+ * $FreeBSD$ 
  * From: $NetBSD: prom_disp.S,v 1.2 1997/04/06 08:41:00 cgd Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/prom_swpal.S b/sys/boot/alpha/libalpha/prom_swpal.S
index b4d3cac757074..be57632ddd9b1 100644
--- a/sys/boot/alpha/libalpha/prom_swpal.S
+++ b/sys/boot/alpha/libalpha/prom_swpal.S
@@ -1,5 +1,5 @@
 /* 
- * $Id$
+ * $FreeBSD$
  * From: $NetBSD: prom_swpal.S,v 1.2 1997/04/06 08:41:01 cgd Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/reboot.c b/sys/boot/alpha/libalpha/reboot.c
index 35750ec0f2af4..3361c6c90348f 100644
--- a/sys/boot/alpha/libalpha/reboot.c
+++ b/sys/boot/alpha/libalpha/reboot.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/alpha/libalpha/srmdisk.c b/sys/boot/alpha/libalpha/srmdisk.c
index 6b7d17b8e76d8..6039a7289168e 100644
--- a/sys/boot/alpha/libalpha/srmdisk.c
+++ b/sys/boot/alpha/libalpha/srmdisk.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: srmdisk.c,v 1.3 1998/11/02 23:28:10 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/alpha/libalpha/srmnet.c b/sys/boot/alpha/libalpha/srmnet.c
index d15fa5f151dd3..d36e557bc1fbb 100644
--- a/sys/boot/alpha/libalpha/srmnet.c
+++ b/sys/boot/alpha/libalpha/srmnet.c
@@ -1,5 +1,5 @@
 /* 
- * $Id$
+ * $FreeBSD$
  * From: $NetBSD: if_prom.c,v 1.10 1997/09/06 14:08:33 drochner Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/start.S b/sys/boot/alpha/libalpha/start.S
index f42b5da4c95c1..fcc5406a01830 100644
--- a/sys/boot/alpha/libalpha/start.S
+++ b/sys/boot/alpha/libalpha/start.S
@@ -1,5 +1,5 @@
 /* 
- * $Id: start.S,v 1.2 1998/10/31 17:12:32 dfr Exp $ 
+ * $FreeBSD$ 
  * From: $NetBSD: start.S,v 1.4 1998/03/28 00:54:15 cgd Exp $ 
  */
 
diff --git a/sys/boot/alpha/libalpha/time.c b/sys/boot/alpha/libalpha/time.c
index 7b87d2fdcc69f..18af172558c81 100644
--- a/sys/boot/alpha/libalpha/time.c
+++ b/sys/boot/alpha/libalpha/time.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/alpha/netboot/conf.c b/sys/boot/alpha/netboot/conf.c
index 8a0e10bad072d..354f9cd1a90d4 100644
--- a/sys/boot/alpha/netboot/conf.c
+++ b/sys/boot/alpha/netboot/conf.c
@@ -1,5 +1,5 @@
 /*
- * $Id: conf.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $
+ * $FreeBSD$
  * From: $NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $
  */
 
diff --git a/sys/boot/alpha/netboot/version b/sys/boot/alpha/netboot/version
index 6346f50d0a0f3..bc9aa00ed9ab1 100644
--- a/sys/boot/alpha/netboot/version
+++ b/sys/boot/alpha/netboot/version
@@ -1,4 +1,4 @@
-$Id$
+$FreeBSD$
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
diff --git a/sys/boot/arc/Makefile b/sys/boot/arc/Makefile
index 4b0436976de69..82043c438af86 100644
--- a/sys/boot/arc/Makefile
+++ b/sys/boot/arc/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.1 1998/08/21 03:17:41 msmith Exp $
+# $FreeBSD$
 
 SUBDIR=		lib
 SUBDIR+=	loader
diff --git a/sys/boot/arc/include/arcfuncs.h b/sys/boot/arc/include/arcfuncs.h
index cc4e48d35a674..25c74465b3fa1 100644
--- a/sys/boot/arc/include/arcfuncs.h
+++ b/sys/boot/arc/include/arcfuncs.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/boot/arc/include/arctypes.h b/sys/boot/arc/include/arctypes.h
index e9c73d308f6df..b823e49babad3 100644
--- a/sys/boot/arc/include/arctypes.h
+++ b/sys/boot/arc/include/arctypes.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/boot/arc/include/libarc.h b/sys/boot/arc/include/libarc.h
index 716215950c705..085d6bbc8eedc 100644
--- a/sys/boot/arc/include/libarc.h
+++ b/sys/boot/arc/include/libarc.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 
 /*
  * Copyright (c) 1996
diff --git a/sys/boot/arc/lib/Makefile b/sys/boot/arc/lib/Makefile
index ec5b6bc75def8..023821cdae1fa 100644
--- a/sys/boot/arc/lib/Makefile
+++ b/sys/boot/arc/lib/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.1 1999/07/28 20:28:45 se Exp $
+# $FreeBSD$
 
 LIB=		arc
 NOPIC=		true
diff --git a/sys/boot/arc/lib/abort.c b/sys/boot/arc/lib/abort.c
index 00480612635fb..4e5951bb50bb4 100644
--- a/sys/boot/arc/lib/abort.c
+++ b/sys/boot/arc/lib/abort.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <errno.h>
diff --git a/sys/boot/arc/lib/arcconsole.c b/sys/boot/arc/lib/arcconsole.c
index e8ecb227ab5f0..9607b6b1c61c8 100644
--- a/sys/boot/arc/lib/arcconsole.c
+++ b/sys/boot/arc/lib/arcconsole.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* $NetBSD: prom.c,v 1.3 1997/09/06 14:03:58 drochner Exp $ */
 
 /*  
diff --git a/sys/boot/arc/lib/arcdisk.c b/sys/boot/arc/lib/arcdisk.c
index 5a6be39b31477..2b548546416d4 100644
--- a/sys/boot/arc/lib/arcdisk.c
+++ b/sys/boot/arc/lib/arcdisk.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/arc/lib/arch/alpha/copy.c b/sys/boot/arc/lib/arch/alpha/copy.c
index 2ca1397668158..2847812fed05e 100644
--- a/sys/boot/arc/lib/arch/alpha/copy.c
+++ b/sys/boot/arc/lib/arch/alpha/copy.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alpha_copy.c,v 1.3 1998/09/20 21:46:19 dfr Exp $
+ * $FreeBSD$
  */
 /*
  * MD primitives supporting placement of module data 
diff --git a/sys/boot/arc/lib/arch/alpha/rpb.c b/sys/boot/arc/lib/arch/alpha/rpb.c
index ac56c824c1b51..4923461557515 100644
--- a/sys/boot/arc/lib/arch/alpha/rpb.c
+++ b/sys/boot/arc/lib/arch/alpha/rpb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/arc/lib/arch/alpha/setjmp.S b/sys/boot/arc/lib/arch/alpha/setjmp.S
index 24502a4f0432c..8e153f7ddd778 100644
--- a/sys/boot/arc/lib/arch/alpha/setjmp.S
+++ b/sys/boot/arc/lib/arch/alpha/setjmp.S
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
diff --git a/sys/boot/arc/lib/arch/alpha/start.S b/sys/boot/arc/lib/arch/alpha/start.S
index af038e9f0e0fa..1b4fc598d6ae1 100644
--- a/sys/boot/arc/lib/arch/alpha/start.S
+++ b/sys/boot/arc/lib/arch/alpha/start.S
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/boot/arc/lib/bootinfo.c b/sys/boot/arc/lib/bootinfo.c
index 949a93c674d56..8b74e0d2c06e0 100644
--- a/sys/boot/arc/lib/bootinfo.c
+++ b/sys/boot/arc/lib/bootinfo.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bootinfo.c,v 1.3 1998/10/15 21:55:58 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/arc/lib/delay.c b/sys/boot/arc/lib/delay.c
index 67b0bf61cb617..e897b4ec7497d 100644
--- a/sys/boot/arc/lib/delay.c
+++ b/sys/boot/arc/lib/delay.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <errno.h>
diff --git a/sys/boot/arc/lib/devicename.c b/sys/boot/arc/lib/devicename.c
index 595c7d22ce20e..56c8c43d510c1 100644
--- a/sys/boot/arc/lib/devicename.c
+++ b/sys/boot/arc/lib/devicename.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: devicename.c,v 1.3 1998/09/26 10:51:37 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/arc/lib/elf_freebsd.c b/sys/boot/arc/lib/elf_freebsd.c
index 84637592c67a3..4e75820a88ca8 100644
--- a/sys/boot/arc/lib/elf_freebsd.c
+++ b/sys/boot/arc/lib/elf_freebsd.c
@@ -1,4 +1,4 @@
-/* $Id: elf_freebsd.c,v 1.6 1998/10/15 21:55:58 dfr Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */
 
 /*-
diff --git a/sys/boot/arc/lib/module.c b/sys/boot/arc/lib/module.c
index 367bf0cb073be..a6a39978eab8a 100644
--- a/sys/boot/arc/lib/module.c
+++ b/sys/boot/arc/lib/module.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alpha_module.c,v 1.2 1998/08/31 21:10:40 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/arc/lib/prom.c b/sys/boot/arc/lib/prom.c
index abf2d39919988..5f13801a8213b 100644
--- a/sys/boot/arc/lib/prom.c
+++ b/sys/boot/arc/lib/prom.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/boot/arc/lib/setjmperr.c b/sys/boot/arc/lib/setjmperr.c
index c68ca02e498a0..9c005e1e9b3f6 100644
--- a/sys/boot/arc/lib/setjmperr.c
+++ b/sys/boot/arc/lib/setjmperr.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <errno.h>
diff --git a/sys/boot/arc/lib/time.c b/sys/boot/arc/lib/time.c
index 8158970251984..bf0ba1ab23b53 100644
--- a/sys/boot/arc/lib/time.c
+++ b/sys/boot/arc/lib/time.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <errno.h>
diff --git a/sys/boot/arc/loader/conf.c b/sys/boot/arc/loader/conf.c
index 1b5384c63f42a..d40ea46fe06a3 100644
--- a/sys/boot/arc/loader/conf.c
+++ b/sys/boot/arc/loader/conf.c
@@ -1,5 +1,5 @@
 /*
- * $Id: conf.c,v 1.2 1998/08/31 21:10:36 msmith Exp $
+ * $FreeBSD$
  * From	$NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $	 
  */
 
diff --git a/sys/boot/arc/loader/main.c b/sys/boot/arc/loader/main.c
index d086a59d6fcf7..ccee80fc4859f 100644
--- a/sys/boot/arc/loader/main.c
+++ b/sys/boot/arc/loader/main.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: main.c,v 1.1.1.1 1999/07/28 20:28:47 se Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/boot/arc/loader/setdef0.c b/sys/boot/arc/loader/setdef0.c
index 79874ea278dd4..49f662ae1d6ca 100644
--- a/sys/boot/arc/loader/setdef0.c
+++ b/sys/boot/arc/loader/setdef0.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: setdef0.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifdef __ELF__
diff --git a/sys/boot/arc/loader/setdef1.c b/sys/boot/arc/loader/setdef1.c
index 9fffaf7b1f7af..13668f08cefc6 100644
--- a/sys/boot/arc/loader/setdef1.c
+++ b/sys/boot/arc/loader/setdef1.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: setdef1.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifdef __ELF__
diff --git a/sys/boot/arc/loader/version b/sys/boot/arc/loader/version
index 23262b91677b6..bc9aa00ed9ab1 100644
--- a/sys/boot/arc/loader/version
+++ b/sys/boot/arc/loader/version
@@ -1,4 +1,4 @@
-$Id: version,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $
+$FreeBSD$
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
diff --git a/sys/boot/common/Makefile.inc b/sys/boot/common/Makefile.inc
index c29494ba6aef9..0d1dc1411c554 100644
--- a/sys/boot/common/Makefile.inc
+++ b/sys/boot/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $Id: Makefile.inc,v 1.7 1998/11/02 23:28:10 msmith Exp $
+# $FreeBSD$
 
 SRCS+=	bcache.c boot.c commands.c console.c devopen.c interp.c 
 SRCS+=	interp_backslash.c interp_parse.c load_aout.c load_elf.c ls.c misc.c 
diff --git a/sys/boot/common/bcache.c b/sys/boot/common/bcache.c
index d780038c07a34..c52854ece5ff5 100644
--- a/sys/boot/common/bcache.c
+++ b/sys/boot/common/bcache.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bcache.c,v 1.4 1998/11/19 18:12:03 paul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/common/boot.c b/sys/boot/common/boot.c
index 70b4671446364..f69d4302d16c2 100644
--- a/sys/boot/common/boot.c
+++ b/sys/boot/common/boot.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: boot.c,v 1.13 1999/07/15 20:40:52 n_hibma Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/common/bootstrap.h b/sys/boot/common/bootstrap.h
index 1cabf70334570..9138b56e3265e 100644
--- a/sys/boot/common/bootstrap.h
+++ b/sys/boot/common/bootstrap.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bootstrap.h,v 1.22 1999/06/26 12:26:54 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/boot/common/commands.c b/sys/boot/common/commands.c
index cc75032e72c00..aa81abcf15b17 100644
--- a/sys/boot/common/commands.c
+++ b/sys/boot/common/commands.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: commands.c,v 1.10 1999/02/01 06:08:20 jkh Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/common/console.c b/sys/boot/common/console.c
index 8c4377f2bcd4f..3f2a8790118a1 100644
--- a/sys/boot/common/console.c
+++ b/sys/boot/common/console.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: console.c,v 1.3 1998/10/11 10:19:11 peter Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/common/dev_net.c b/sys/boot/common/dev_net.c
index a66523a08ac04..cf12680c31356 100644
--- a/sys/boot/common/dev_net.c
+++ b/sys/boot/common/dev_net.c
@@ -1,5 +1,5 @@
 /*	
- * $Id: dev_net.c,v 1.3 1998/09/20 21:46:19 dfr Exp $
+ * $FreeBSD$
  * From: $NetBSD: dev_net.c,v 1.12 1997/12/10 20:38:37 gwr Exp $
  */
 
diff --git a/sys/boot/common/dev_net.h b/sys/boot/common/dev_net.h
index 7c256ffb2baac..3b3d10728a3d3 100644
--- a/sys/boot/common/dev_net.h
+++ b/sys/boot/common/dev_net.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 extern struct devsw netdev;
diff --git a/sys/boot/common/devopen.c b/sys/boot/common/devopen.c
index 83489c6dd24fc..77d6ffac9851f 100644
--- a/sys/boot/common/devopen.c
+++ b/sys/boot/common/devopen.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: devopen.c,v 1.1.1.1 1998/08/21 03:17:41 msmith Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/boot/common/gensetdefs.c b/sys/boot/common/gensetdefs.c
index 9927e8ae45791..a78e456de16ef 100644
--- a/sys/boot/common/gensetdefs.c
+++ b/sys/boot/common/gensetdefs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: gensetdefs.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/boot/common/interp.c b/sys/boot/common/interp.c
index 897f1175d833b..4f321bd31c49b 100644
--- a/sys/boot/common/interp.c
+++ b/sys/boot/common/interp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: interp.c,v 1.17 1999/03/08 10:32:38 dcs Exp $
+ * $FreeBSD$
  */
 /*
  * Simple commandline interpreter, toplevel and misc.
diff --git a/sys/boot/common/interp_backslash.c b/sys/boot/common/interp_backslash.c
index 6de118ec63fc6..6325e4ef34898 100644
--- a/sys/boot/common/interp_backslash.c
+++ b/sys/boot/common/interp_backslash.c
@@ -11,7 +11,7 @@
  * Jordan K. Hubbard
  * 29 August 1998
  *
- *	$Id: interp_backslash.c,v 1.2 1998/09/03 06:14:41 jkh Exp $
+ * $FreeBSD$
  *
  * Routine for doing backslash elimination.
  */
diff --git a/sys/boot/common/interp_forth.c b/sys/boot/common/interp_forth.c
index 4f653275c78f5..8b965ff867473 100644
--- a/sys/boot/common/interp_forth.c
+++ b/sys/boot/common/interp_forth.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: interp_forth.c,v 1.12 1999/02/04 17:06:46 dcs Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>		/* to pick up __FreeBSD_version */
diff --git a/sys/boot/common/interp_parse.c b/sys/boot/common/interp_parse.c
index 6c387106ab833..0f83c430766c3 100644
--- a/sys/boot/common/interp_parse.c
+++ b/sys/boot/common/interp_parse.c
@@ -11,7 +11,7 @@
  * Jordan K. Hubbard
  * 29 August 1998
  *
- *	$Id: interp_parse.c,v 1.6 1999/01/13 08:11:41 msmith Exp $
+ * $FreeBSD$
  * 
  * The meat of the simple parser.
  */
diff --git a/sys/boot/common/isapnp.c b/sys/boot/common/isapnp.c
index 865e8f683e153..19417068601aa 100644
--- a/sys/boot/common/isapnp.c
+++ b/sys/boot/common/isapnp.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: isapnp.c,v 1.3 1998/10/21 20:07:04 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/common/isapnp.h b/sys/boot/common/isapnp.h
index d1311b27aa0aa..3ebd66a0d2307 100644
--- a/sys/boot/common/isapnp.h
+++ b/sys/boot/common/isapnp.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: isapnp.h,v 1.2 1998/10/21 20:07:04 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_ISA_PNP_H_
diff --git a/sys/boot/common/load.c b/sys/boot/common/load.c
index d59fdf398c4ca..e91c5fb8b5690 100644
--- a/sys/boot/common/load.c
+++ b/sys/boot/common/load.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/common/load_aout.c b/sys/boot/common/load_aout.c
index 3e6aeced5d7ff..8947a7384174d 100644
--- a/sys/boot/common/load_aout.c
+++ b/sys/boot/common/load_aout.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: load_aout.c,v 1.13 1999/01/22 23:50:14 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/common/load_elf.c b/sys/boot/common/load_elf.c
index bc514b1bc3acc..024fece0718f9 100644
--- a/sys/boot/common/load_elf.c
+++ b/sys/boot/common/load_elf.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: load_elf.c,v 1.10 1999/01/04 18:37:41 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8
index 27268bb59f7d5..ef847c10e68f5 100644
--- a/sys/boot/common/loader.8
+++ b/sys/boot/common/loader.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: loader.8,v 1.7 1999/06/23 09:06:18 ru Exp $
+.\" $FreeBSD$
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
diff --git a/sys/boot/common/ls.c b/sys/boot/common/ls.c
index 73f805700bf89..ef99d7067a9da 100644
--- a/sys/boot/common/ls.c
+++ b/sys/boot/common/ls.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ls.c,v 1.6 1998/10/11 10:28:51 peter Exp $
+ * $FreeBSD$
  * From: $NetBSD: ls.c,v 1.3 1997/06/13 13:48:47 drochner Exp $
  */
 
diff --git a/sys/boot/common/merge_help.awk b/sys/boot/common/merge_help.awk
index 1376c53aee3cf..9741ed3663e49 100644
--- a/sys/boot/common/merge_help.awk
+++ b/sys/boot/common/merge_help.awk
@@ -1,6 +1,6 @@
 #!/usr/bin/awk -f
 #
-# $Id: mergehelp.awk,v 1.3 1999/01/13 20:06:52 jabley Exp $
+# $FreeBSD$
 #
 # Merge two boot loader help files for FreeBSD 3.0
 # Joe Abley <jabley@patho.gen.nz>
diff --git a/sys/boot/common/misc.c b/sys/boot/common/misc.c
index 36600e76485c2..819d4a46594c5 100644
--- a/sys/boot/common/misc.c
+++ b/sys/boot/common/misc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: misc.c,v 1.4 1998/09/26 10:51:38 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <string.h>
diff --git a/sys/boot/common/module.c b/sys/boot/common/module.c
index 01416596ce2bd..d2adeab03e700 100644
--- a/sys/boot/common/module.c
+++ b/sys/boot/common/module.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: module.c,v 1.8 1999/02/22 13:12:37 dcs Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/common/panic.c b/sys/boot/common/panic.c
index bee6a0327df45..bad1e45c5dc1a 100644
--- a/sys/boot/common/panic.c
+++ b/sys/boot/common/panic.c
@@ -1,5 +1,5 @@
 /*
- * $Id: panic.c,v 1.3 1998/09/18 02:01:38 msmith Exp $
+ * $FreeBSD$
  * From: $NetBSD: panic.c,v 1.2 1997/03/22 01:48:36 thorpej Exp $
  */
 
diff --git a/sys/boot/common/pnpdata b/sys/boot/common/pnpdata
index 62d35a8193860..f2e262070d96e 100644
--- a/sys/boot/common/pnpdata
+++ b/sys/boot/common/pnpdata
@@ -1,5 +1,5 @@
 #
-# $Id$
+# $FreeBSD$
 #
 # This file contains the system default Plug-and-Play data.  It is
 # derived from a number of sources, including:
diff --git a/sys/boot/ficl/Makefile b/sys/boot/ficl/Makefile
index ab10716207042..5f724bbcaf360 100644
--- a/sys/boot/ficl/Makefile
+++ b/sys/boot/ficl/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.9 1999/03/17 23:03:36 dcs Exp $
+# $FreeBSD$
 #
 LIB=			ficl
 NOPROFILE=		yes
diff --git a/sys/boot/ficl/softwords/freebsd.fr b/sys/boot/ficl/softwords/freebsd.fr
index 9ebeacba01cd1..96205c0808dd1 100644
--- a/sys/boot/ficl/softwords/freebsd.fr
+++ b/sys/boot/ficl/softwords/freebsd.fr
@@ -22,7 +22,7 @@
 \ ** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ ** SUCH DAMAGE.
 \ **
-\ **      $Id: freebsd.fr,v 1.2 1999/02/28 02:10:14 dcs Exp $
+\ ** $FreeBSD$
 
 \ Words for use in scripts:
 \ % ignore errors here
diff --git a/sys/boot/forth/loader.4th b/sys/boot/forth/loader.4th
index e219b56f29526..9f40cb2053c18 100644
--- a/sys/boot/forth/loader.4th
+++ b/sys/boot/forth/loader.4th
@@ -22,7 +22,7 @@
 \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ SUCH DAMAGE.
 \
-\	$Id: loader.4th,v 1.2 1999/04/24 17:25:25 dcs Exp $
+\ $FreeBSD$
 
 include /boot/support.4th
 
diff --git a/sys/boot/forth/loader.4th.8 b/sys/boot/forth/loader.4th.8
index 3a42138620933..3aedb666801a7 100644
--- a/sys/boot/forth/loader.4th.8
+++ b/sys/boot/forth/loader.4th.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: loader.4th.8,v 1.2 1999/05/03 07:25:50 jkoshy Exp $
+.\" $FreeBSD$
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf
index 8bc0ec5dff199..c860ae29c193b 100644
--- a/sys/boot/forth/loader.conf
+++ b/sys/boot/forth/loader.conf
@@ -6,7 +6,7 @@
 #
 # All arguments must be in double quotes.
 #
-#	$Id: loader.conf,v 1.9 1999/08/10 17:15:20 wpaul Exp $
+# $FreeBSD$
 
 ##############################################################
 ###  Basic configuration options  ############################
diff --git a/sys/boot/forth/loader.conf.5 b/sys/boot/forth/loader.conf.5
index c4114ff7f395c..8a76f8247e063 100644
--- a/sys/boot/forth/loader.conf.5
+++ b/sys/boot/forth/loader.conf.5
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: loader.conf.5,v 1.3 1999/05/13 14:53:13 brian Exp $
+.\" $FreeBSD$
 .Dd April 18, 1999
 .Dt LOADER.CONF 5
 .Os
diff --git a/sys/boot/forth/support.4th b/sys/boot/forth/support.4th
index 20126ccfa0c39..5f594ef5612be 100644
--- a/sys/boot/forth/support.4th
+++ b/sys/boot/forth/support.4th
@@ -22,7 +22,7 @@
 \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 \ SUCH DAMAGE.
 \
-\	$Id$
+\ $FreeBSD$
 
 \ Loader.rc support functions:
 \
diff --git a/sys/boot/i386/Makefile b/sys/boot/i386/Makefile
index 27b2306567618..2ee6e63a51956 100644
--- a/sys/boot/i386/Makefile
+++ b/sys/boot/i386/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.8 1999/05/24 22:44:32 rnordier Exp $
+# $FreeBSD$
 
 SUBDIR=		mbr boot0 kgzldr btx boot2 libi386 loader
 
diff --git a/sys/boot/i386/boot0/Makefile b/sys/boot/i386/boot0/Makefile
index 7bbeb6573e1b3..5ccddf2502923 100644
--- a/sys/boot/i386/boot0/Makefile
+++ b/sys/boot/i386/boot0/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.6 1998/10/19 19:13:52 rnordier Exp $
+# $FreeBSD$
 
 PROG=		boot0
 NOMAN=
diff --git a/sys/boot/i386/boot0/boot0.m4 b/sys/boot/i386/boot0/boot0.m4
index 72be7ed475a61..d318d2a07e87a 100644
--- a/sys/boot/i386/boot0/boot0.m4
+++ b/sys/boot/i386/boot0/boot0.m4
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: boot0.m4,v 1.3 1998/11/29 14:09:00 rnordier Exp $
+# $FreeBSD$
 
 define(_al,0x0)dnl
 define(_cl,0x1)dnl
diff --git a/sys/boot/i386/boot0/boot0.s b/sys/boot/i386/boot0/boot0.s
index cc11f19290242..00c63914604a7 100644
--- a/sys/boot/i386/boot0/boot0.s
+++ b/sys/boot/i386/boot0/boot0.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: boot0.s,v 1.10 1999/06/19 21:40:55 rnordier Exp $
+# $FreeBSD$
 
 # A 512-byte boot manager.
 
diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile
index 25ec504a0acc1..578b452c6051c 100644
--- a/sys/boot/i386/boot2/Makefile
+++ b/sys/boot/i386/boot2/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.12 1999/04/05 07:24:51 rnordier Exp $
+# $FreeBSD$
 
 PROG=		boot2
 NOMAN=
diff --git a/sys/boot/i386/boot2/boot1.S b/sys/boot/i386/boot2/boot1.S
index d1707efff7325..d78aaf29b4a6a 100644
--- a/sys/boot/i386/boot2/boot1.S
+++ b/sys/boot/i386/boot2/boot1.S
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: boot1.s,v 1.8 1999/01/13 23:30:07 rnordier Exp $
+# $FreeBSD$
 
 		.set MEM_REL,0x700		# Relocation address
 		.set MEM_ARG,0x900		# Arguments
diff --git a/sys/boot/i386/boot2/boot1.m4 b/sys/boot/i386/boot2/boot1.m4
index 966d8c646c474..94dd13bd18b9d 100644
--- a/sys/boot/i386/boot2/boot1.m4
+++ b/sys/boot/i386/boot2/boot1.m4
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: boot1.m4,v 1.3 1998/11/08 15:36:35 rnordier Exp $
+# $FreeBSD$
 
 define(_al,0x0)dnl
 define(_cl,0x1)dnl
diff --git a/sys/boot/i386/boot2/boot1.s b/sys/boot/i386/boot2/boot1.s
index d1707efff7325..d78aaf29b4a6a 100644
--- a/sys/boot/i386/boot2/boot1.s
+++ b/sys/boot/i386/boot2/boot1.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: boot1.s,v 1.8 1999/01/13 23:30:07 rnordier Exp $
+# $FreeBSD$
 
 		.set MEM_REL,0x700		# Relocation address
 		.set MEM_ARG,0x900		# Arguments
diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c
index 67c5ec85289e9..eefcf086c5f2e 100644
--- a/sys/boot/i386/boot2/boot2.c
+++ b/sys/boot/i386/boot2/boot2.c
@@ -14,7 +14,7 @@
  */
 
 /*
- *	$Id: boot2.c,v 1.23 1999/04/05 07:36:30 rnordier Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/i386/boot2/lib.h b/sys/boot/i386/boot2/lib.h
index 493c4d8fda01f..4bb93cfe9d3ef 100644
--- a/sys/boot/i386/boot2/lib.h
+++ b/sys/boot/i386/boot2/lib.h
@@ -14,7 +14,7 @@
  */
 
 /*
- *	$Id:$
+ * $FreeBSD$
  */
 
 void sio_init(void);
diff --git a/sys/boot/i386/boot2/sio.S b/sys/boot/i386/boot2/sio.S
index 92237b852b729..e29820586a3bc 100644
--- a/sys/boot/i386/boot2/sio.S
+++ b/sys/boot/i386/boot2/sio.S
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: sio.s,v 1.2 1998/10/20 20:20:48 rnordier Exp $
+# $FreeBSD$
 
 		.set SIO_PRT,SIOPRT		# Base port
 		.set SIO_FMT,SIOFMT		# 8N1
diff --git a/sys/boot/i386/boot2/sio.s b/sys/boot/i386/boot2/sio.s
index 92237b852b729..e29820586a3bc 100644
--- a/sys/boot/i386/boot2/sio.s
+++ b/sys/boot/i386/boot2/sio.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: sio.s,v 1.2 1998/10/20 20:20:48 rnordier Exp $
+# $FreeBSD$
 
 		.set SIO_PRT,SIOPRT		# Base port
 		.set SIO_FMT,SIOFMT		# 8N1
diff --git a/sys/boot/i386/btx/Makefile b/sys/boot/i386/btx/Makefile
index 75a170e53c7eb..39f78ed639b9c 100644
--- a/sys/boot/i386/btx/Makefile
+++ b/sys/boot/i386/btx/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1998/09/17 23:52:03 msmith Exp $
+# $FreeBSD$
 
 SUBDIR=	btx btxldr lib
 
diff --git a/sys/boot/i386/btx/btx/Makefile b/sys/boot/i386/btx/btx/Makefile
index 6657f6e266cbe..c29339d569ebf 100644
--- a/sys/boot/i386/btx/btx/Makefile
+++ b/sys/boot/i386/btx/btx/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1998/09/25 17:14:15 peter Exp $
+# $FreeBSD$
 
 M4?=	m4
 
diff --git a/sys/boot/i386/btx/btx/btx.S b/sys/boot/i386/btx/btx/btx.S
index 29b97950a709c..b3f3150e84afb 100644
--- a/sys/boot/i386/btx/btx/btx.S
+++ b/sys/boot/i386/btx/btx/btx.S
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btx.s,v 1.9 1999/01/22 13:07:17 rnordier Exp $
+# $FreeBSD$
 
 #
 # Memory layout.
diff --git a/sys/boot/i386/btx/btx/btx.m4 b/sys/boot/i386/btx/btx/btx.m4
index 598db02a2039a..70649bbb6c911 100644
--- a/sys/boot/i386/btx/btx/btx.m4
+++ b/sys/boot/i386/btx/btx/btx.m4
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id:$
+# $FreeBSD$
 
 define(_al,0x0)dnl
 define(_cl,0x1)dnl
diff --git a/sys/boot/i386/btx/btx/btx.s b/sys/boot/i386/btx/btx/btx.s
index 29b97950a709c..b3f3150e84afb 100644
--- a/sys/boot/i386/btx/btx/btx.s
+++ b/sys/boot/i386/btx/btx/btx.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btx.s,v 1.9 1999/01/22 13:07:17 rnordier Exp $
+# $FreeBSD$
 
 #
 # Memory layout.
diff --git a/sys/boot/i386/btx/btxldr/Makefile b/sys/boot/i386/btx/btxldr/Makefile
index 32cb4adb0b8e1..33e6275360b73 100644
--- a/sys/boot/i386/btx/btxldr/Makefile
+++ b/sys/boot/i386/btx/btxldr/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.5 1998/10/13 18:29:18 rnordier Exp $
+# $FreeBSD$
 
 ORG=0x100000
 AFLAGS+=	--assembler-with-cpp
diff --git a/sys/boot/i386/btx/btxldr/btxldr.S b/sys/boot/i386/btx/btxldr/btxldr.S
index 5d3b301e0f5d8..92748f1abafab 100644
--- a/sys/boot/i386/btx/btxldr/btxldr.S
+++ b/sys/boot/i386/btx/btxldr/btxldr.S
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btxldr.s,v 1.4 1998/10/30 00:11:35 msmith Exp $
+# $FreeBSD$
 
 #
 # Prototype BTX loader program, written in a couple of hours.  The
diff --git a/sys/boot/i386/btx/btxldr/btxldr.s b/sys/boot/i386/btx/btxldr/btxldr.s
index 5d3b301e0f5d8..92748f1abafab 100644
--- a/sys/boot/i386/btx/btxldr/btxldr.s
+++ b/sys/boot/i386/btx/btxldr/btxldr.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btxldr.s,v 1.4 1998/10/30 00:11:35 msmith Exp $
+# $FreeBSD$
 
 #
 # Prototype BTX loader program, written in a couple of hours.  The
diff --git a/sys/boot/i386/btx/lib/Makefile b/sys/boot/i386/btx/lib/Makefile
index e6fb758188946..40c65657ea7a9 100644
--- a/sys/boot/i386/btx/lib/Makefile
+++ b/sys/boot/i386/btx/lib/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1998/09/14 10:37:00 rnordier Exp $
+# $FreeBSD$
 
 OBJS=		btxcsu.o btxsys.o btxv86.o
 AFLAGS+=	-elf
diff --git a/sys/boot/i386/btx/lib/btxcsu.s b/sys/boot/i386/btx/lib/btxcsu.s
index 9b3e4c24e19c2..f08ae754f8269 100644
--- a/sys/boot/i386/btx/lib/btxcsu.s
+++ b/sys/boot/i386/btx/lib/btxcsu.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btxcsu.s,v 1.1 1998/09/14 10:37:00 rnordier Exp $
+# $FreeBSD$
 
 #
 # BTX C startup code (ELF).
diff --git a/sys/boot/i386/btx/lib/btxsys.s b/sys/boot/i386/btx/lib/btxsys.s
index 16e3228a50ec9..9c77b4295e7cf 100644
--- a/sys/boot/i386/btx/lib/btxsys.s
+++ b/sys/boot/i386/btx/lib/btxsys.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id:$
+# $FreeBSD$
 
 #
 # BTX system calls.
diff --git a/sys/boot/i386/btx/lib/btxv86.h b/sys/boot/i386/btx/lib/btxv86.h
index 1e7717f069c71..1152f8b1d9635 100644
--- a/sys/boot/i386/btx/lib/btxv86.h
+++ b/sys/boot/i386/btx/lib/btxv86.h
@@ -14,7 +14,7 @@
  */
 
 /*
- *	$Id: btxv86.h,v 1.3 1998/10/02 16:22:54 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifndef _BTXV86_H_
diff --git a/sys/boot/i386/btx/lib/btxv86.s b/sys/boot/i386/btx/lib/btxv86.s
index 46709a39540c8..0d7d1116322d2 100644
--- a/sys/boot/i386/btx/lib/btxv86.s
+++ b/sys/boot/i386/btx/lib/btxv86.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btxv86.s,v 1.1 1998/09/14 10:37:00 rnordier Exp $
+# $FreeBSD$
 
 #
 # BTX V86 interface.
diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile
index 25ec504a0acc1..578b452c6051c 100644
--- a/sys/boot/i386/gptboot/Makefile
+++ b/sys/boot/i386/gptboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.12 1999/04/05 07:24:51 rnordier Exp $
+# $FreeBSD$
 
 PROG=		boot2
 NOMAN=
diff --git a/sys/boot/i386/gptboot/gptboot.c b/sys/boot/i386/gptboot/gptboot.c
index 67c5ec85289e9..eefcf086c5f2e 100644
--- a/sys/boot/i386/gptboot/gptboot.c
+++ b/sys/boot/i386/gptboot/gptboot.c
@@ -14,7 +14,7 @@
  */
 
 /*
- *	$Id: boot2.c,v 1.23 1999/04/05 07:36:30 rnordier Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/i386/kgzldr/Makefile b/sys/boot/i386/kgzldr/Makefile
index 2d1e840f5a493..bb97590301d53 100644
--- a/sys/boot/i386/kgzldr/Makefile
+++ b/sys/boot/i386/kgzldr/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1.1.1 1999/07/19 18:07:44 rnordier Exp $
+# $FreeBSD$
 
 PROG=	kgzldr.o
 SRCS=	start.s boot.c inflate.c lib.c crt.s sio.s
diff --git a/sys/boot/i386/kgzldr/boot.c b/sys/boot/i386/kgzldr/boot.c
index 0313be7b34c10..cbcd498fadd2c 100644
--- a/sys/boot/i386/kgzldr/boot.c
+++ b/sys/boot/i386/kgzldr/boot.c
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id:$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/boot/i386/kgzldr/crt.s b/sys/boot/i386/kgzldr/crt.s
index 4c0474755d47c..cfb479fd2d84f 100644
--- a/sys/boot/i386/kgzldr/crt.s
+++ b/sys/boot/i386/kgzldr/crt.s
@@ -24,7 +24,7 @@
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 #	From: btx.s 1.10 1999/02/25 16:27:41 rnordier
-#	$Id:$
+# $FreeBSD$
 #
 
 # Screen defaults and assumptions.
diff --git a/sys/boot/i386/kgzldr/kgzldr.h b/sys/boot/i386/kgzldr/kgzldr.h
index 7f18c7e0b5d39..5cd5b44b60057 100644
--- a/sys/boot/i386/kgzldr/kgzldr.h
+++ b/sys/boot/i386/kgzldr/kgzldr.h
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id:$
+ * $FreeBSD$
  */
 
 #define KGZ_CRT	 0x1		/* Video console */
diff --git a/sys/boot/i386/kgzldr/lib.c b/sys/boot/i386/kgzldr/lib.c
index f763f31192744..ebec384a0b27c 100644
--- a/sys/boot/i386/kgzldr/lib.c
+++ b/sys/boot/i386/kgzldr/lib.c
@@ -23,7 +23,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id:$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/boot/i386/kgzldr/sio.s b/sys/boot/i386/kgzldr/sio.s
index 78fd6ca313732..bb354e297dd06 100644
--- a/sys/boot/i386/kgzldr/sio.s
+++ b/sys/boot/i386/kgzldr/sio.s
@@ -24,7 +24,7 @@
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 #	From: sio.s 1.3 1999/01/10 14:48:03 rnordier
-#	$Id:$
+# $FreeBSD$
 #
 
 		.set SIO_PRT,SIOPRT		# Base port
diff --git a/sys/boot/i386/kgzldr/start.s b/sys/boot/i386/kgzldr/start.s
index d565cecfbf51e..550fa526d946f 100644
--- a/sys/boot/i386/kgzldr/start.s
+++ b/sys/boot/i386/kgzldr/start.s
@@ -23,7 +23,7 @@
 # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#	$Id:$
+# $FreeBSD$
 #
 
 		.set entry,0x10			# kgz.entry
diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile
index 2cfd2e345956a..e28ac4acc04ad 100644
--- a/sys/boot/i386/libi386/Makefile
+++ b/sys/boot/i386/libi386/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.12 1998/12/22 11:51:25 abial Exp $
+# $FreeBSD$
 #
 LIB=			i386
 NOPIC=
diff --git a/sys/boot/i386/libi386/aout_freebsd.c b/sys/boot/i386/libi386/aout_freebsd.c
index 96d74d81d00fb..b81e551553895 100644
--- a/sys/boot/i386/libi386/aout_freebsd.c
+++ b/sys/boot/i386/libi386/aout_freebsd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: aout_freebsd.c,v 1.10 1998/10/09 07:11:19 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/i386/libi386/biosdisk.c b/sys/boot/i386/libi386/biosdisk.c
index 00c38eeb4a6b6..2b5ba095b086f 100644
--- a/sys/boot/i386/libi386/biosdisk.c
+++ b/sys/boot/i386/libi386/biosdisk.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: biosdisk.c,v 1.23 1999/01/25 23:07:02 rnordier Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/i386/libi386/biospci.c b/sys/boot/i386/libi386/biospci.c
index 92f4fd28c2972..483384c2c1570 100644
--- a/sys/boot/i386/libi386/biospci.c
+++ b/sys/boot/i386/libi386/biospci.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/i386/libi386/biospnp.c b/sys/boot/i386/libi386/biospnp.c
index a6064ba27462c..616a22cdc4587 100644
--- a/sys/boot/i386/libi386/biospnp.c
+++ b/sys/boot/i386/libi386/biospnp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: biospnp.c,v 1.2 1998/10/23 22:29:08 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/i386/libi386/bootinfo.c b/sys/boot/i386/libi386/bootinfo.c
index a07012e061b97..8363b9fd25a1c 100644
--- a/sys/boot/i386/libi386/bootinfo.c
+++ b/sys/boot/i386/libi386/bootinfo.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bootinfo.c,v 1.20 1999/06/21 18:27:01 rnordier Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/i386/libi386/bootinfo32.c b/sys/boot/i386/libi386/bootinfo32.c
index a07012e061b97..8363b9fd25a1c 100644
--- a/sys/boot/i386/libi386/bootinfo32.c
+++ b/sys/boot/i386/libi386/bootinfo32.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bootinfo.c,v 1.20 1999/06/21 18:27:01 rnordier Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/i386/libi386/bootinfo64.c b/sys/boot/i386/libi386/bootinfo64.c
index a07012e061b97..8363b9fd25a1c 100644
--- a/sys/boot/i386/libi386/bootinfo64.c
+++ b/sys/boot/i386/libi386/bootinfo64.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bootinfo.c,v 1.20 1999/06/21 18:27:01 rnordier Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/i386/libi386/comconsole.c b/sys/boot/i386/libi386/comconsole.c
index 7b35d1dce8c97..ee6fbc8f53a7f 100644
--- a/sys/boot/i386/libi386/comconsole.c
+++ b/sys/boot/i386/libi386/comconsole.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: comconsole.c,v 1.5 1998/11/22 07:59:16 rnordier Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/i386/libi386/devicename.c b/sys/boot/i386/libi386/devicename.c
index 418163edeaee6..dfa685eb1b876 100644
--- a/sys/boot/i386/libi386/devicename.c
+++ b/sys/boot/i386/libi386/devicename.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: devicename.c,v 1.2 1998/09/26 01:30:20 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/i386/libi386/elf32_freebsd.c b/sys/boot/i386/libi386/elf32_freebsd.c
index 130b0cab465b4..a3d3ef9412d64 100644
--- a/sys/boot/i386/libi386/elf32_freebsd.c
+++ b/sys/boot/i386/libi386/elf32_freebsd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: elf_freebsd.c,v 1.5 1998/10/04 20:58:46 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/i386/libi386/elf64_freebsd.c b/sys/boot/i386/libi386/elf64_freebsd.c
index 130b0cab465b4..a3d3ef9412d64 100644
--- a/sys/boot/i386/libi386/elf64_freebsd.c
+++ b/sys/boot/i386/libi386/elf64_freebsd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: elf_freebsd.c,v 1.5 1998/10/04 20:58:46 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/i386/libi386/elf_freebsd.c b/sys/boot/i386/libi386/elf_freebsd.c
index 130b0cab465b4..a3d3ef9412d64 100644
--- a/sys/boot/i386/libi386/elf_freebsd.c
+++ b/sys/boot/i386/libi386/elf_freebsd.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: elf_freebsd.c,v 1.5 1998/10/04 20:58:46 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/i386/libi386/gatea20.c b/sys/boot/i386/libi386/gatea20.c
index bb109dbe7cf2d..b85265489e7d6 100644
--- a/sys/boot/i386/libi386/gatea20.c
+++ b/sys/boot/i386/libi386/gatea20.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $FreeBSD$
  * From: $NetBSD: gatea20.c,v 1.2 1997/10/29 00:32:49 fvdl Exp $
  */
 
diff --git a/sys/boot/i386/libi386/i386_module.c b/sys/boot/i386/libi386/i386_module.c
index 3d75c760ed0a4..7040e9fcd3002 100644
--- a/sys/boot/i386/libi386/i386_module.c
+++ b/sys/boot/i386/libi386/i386_module.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: i386_module.c,v 1.1.1.1 1998/08/21 03:17:41 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/i386/libi386/libi386.h b/sys/boot/i386/libi386/libi386.h
index a7be851483032..1868faa9c2b6c 100644
--- a/sys/boot/i386/libi386/libi386.h
+++ b/sys/boot/i386/libi386/libi386.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: libi386.h,v 1.8 1998/10/02 20:53:17 msmith Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/boot/i386/libi386/pread.c b/sys/boot/i386/libi386/pread.c
index 36ffb014cdbf5..fb73f042216f1 100644
--- a/sys/boot/i386/libi386/pread.c
+++ b/sys/boot/i386/libi386/pread.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $FreeBSD$
  * From: $NetBSD: pread.c,v 1.2 1997/03/22 01:48:38 thorpej Exp $
  */
 
diff --git a/sys/boot/i386/libi386/vidconsole.c b/sys/boot/i386/libi386/vidconsole.c
index 05e77110c2efa..a79bb05ce0939 100644
--- a/sys/boot/i386/libi386/vidconsole.c
+++ b/sys/boot/i386/libi386/vidconsole.c
@@ -26,7 +26,7 @@
  *
  * 	From Id: probe_keyboard.c,v 1.13 1997/06/09 05:10:55 bde Exp
  *
- *	$Id: vidconsole.c,v 1.10 1998/12/31 13:44:04 abial Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index 966d4369afe7c..e74d16f974f23 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.34 1999/04/24 17:49:47 dcs Exp $
+# $FreeBSD$
 
 BASE=		loader
 PROG=		${BASE}
diff --git a/sys/boot/i386/loader/conf.c b/sys/boot/i386/loader/conf.c
index 9b4d554bc1a03..6ffa49f6a43bb 100644
--- a/sys/boot/i386/loader/conf.c
+++ b/sys/boot/i386/loader/conf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: conf.c,v 1.9 1998/10/22 20:23:58 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/i386/loader/loader.8 b/sys/boot/i386/loader/loader.8
index 27268bb59f7d5..ef847c10e68f5 100644
--- a/sys/boot/i386/loader/loader.8
+++ b/sys/boot/i386/loader/loader.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: loader.8,v 1.7 1999/06/23 09:06:18 ru Exp $
+.\" $FreeBSD$
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
diff --git a/sys/boot/i386/loader/main.c b/sys/boot/i386/loader/main.c
index dfd1bfffbb98c..3277738206332 100644
--- a/sys/boot/i386/loader/main.c
+++ b/sys/boot/i386/loader/main.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: main.c,v 1.13 1998/10/22 20:23:58 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/i386/loader/version b/sys/boot/i386/loader/version
index ad310451c4980..01f8500452c35 100644
--- a/sys/boot/i386/loader/version
+++ b/sys/boot/i386/loader/version
@@ -1,4 +1,4 @@
-$Id: version,v 1.3 1999/02/08 04:14:31 dcs Exp $
+$FreeBSD$
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
diff --git a/sys/boot/i386/mbr/Makefile b/sys/boot/i386/mbr/Makefile
index ef206e5374d40..1090ab02bb110 100644
--- a/sys/boot/i386/mbr/Makefile
+++ b/sys/boot/i386/mbr/Makefile
@@ -1,4 +1,4 @@
-#	$Id: $
+# $FreeBSD$
 
 PROG=		mbr
 NOMAN=
diff --git a/sys/boot/i386/mbr/mbr.m4 b/sys/boot/i386/mbr/mbr.m4
index 768e26281771e..c8783b92059e4 100644
--- a/sys/boot/i386/mbr/mbr.m4
+++ b/sys/boot/i386/mbr/mbr.m4
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: $
+# $FreeBSD$
 
 define(_al,0x0)dnl
 define(_cl,0x1)dnl
diff --git a/sys/boot/i386/mbr/mbr.s b/sys/boot/i386/mbr/mbr.s
index f849fb2a0ab1d..6c030de1c79bf 100644
--- a/sys/boot/i386/mbr/mbr.s
+++ b/sys/boot/i386/mbr/mbr.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: mbr.s,v 1.1.1.1 1999/05/24 22:36:24 rnordier Exp $
+# $FreeBSD$
 
 # Master boot record
 
diff --git a/sys/boot/ofw/libofw/devicename.c b/sys/boot/ofw/libofw/devicename.c
index dcd07ede1fcbe..d8ee1133299e2 100644
--- a/sys/boot/ofw/libofw/devicename.c
+++ b/sys/boot/ofw/libofw/devicename.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: devicename.c,v 1.2 1998/08/22 10:31:01 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/ofw/libofw/ofw_console.c b/sys/boot/ofw/libofw/ofw_console.c
index 380326ccd0ec4..e32d43d3b66fc 100644
--- a/sys/boot/ofw/libofw/ofw_console.c
+++ b/sys/boot/ofw/libofw/ofw_console.c
@@ -1,4 +1,4 @@
-/* $Id: prom.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: prom.c,v 1.3 1997/09/06 14:03:58 drochner Exp $ */
 
 /*  
diff --git a/sys/boot/ofw/libofw/ofw_copy.c b/sys/boot/ofw/libofw/ofw_copy.c
index 196915c1eb23e..95b6cba677e4d 100644
--- a/sys/boot/ofw/libofw/ofw_copy.c
+++ b/sys/boot/ofw/libofw/ofw_copy.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alpha_copy.c,v 1.2 1998/09/03 02:10:07 msmith Exp $
+ * $FreeBSD$
  */
 /*
  * MD primitives supporting placement of module data 
diff --git a/sys/boot/ofw/libofw/ofw_module.c b/sys/boot/ofw/libofw/ofw_module.c
index afa065f5bd04e..4ac21d42242d8 100644
--- a/sys/boot/ofw/libofw/ofw_module.c
+++ b/sys/boot/ofw/libofw/ofw_module.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alpha_module.c,v 1.1.1.1 1998/08/21 03:17:42 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/pc98/Makefile b/sys/boot/pc98/Makefile
index 72ce2cebd7119..5d013df2dce79 100644
--- a/sys/boot/pc98/Makefile
+++ b/sys/boot/pc98/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 1998/10/14 20:40:56 rnordier Exp $
+# $FreeBSD$
 
 SUBDIR=		btx boot2 libpc98 loader
 
diff --git a/sys/boot/pc98/boot2/Makefile b/sys/boot/pc98/boot2/Makefile
index c7434725ccc7c..800306dde4dbb 100644
--- a/sys/boot/pc98/boot2/Makefile
+++ b/sys/boot/pc98/boot2/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/02/03 08:39:08 kato Exp $
+# $FreeBSD$
 #
 
 PROG=	boot
diff --git a/sys/boot/pc98/boot2/asm.S b/sys/boot/pc98/boot2/asm.S
index 01d47f20f01bc..f14c7f55104cc 100644
--- a/sys/boot/pc98/boot2/asm.S
+++ b/sys/boot/pc98/boot2/asm.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:13  rpd
- *	$Id: asm.S,v 1.4 1997/09/01 10:38:24 kato Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/boot/pc98/boot2/asm.h b/sys/boot/pc98/boot2/asm.h
index 2e0fcac85abe2..6f4bcc39e52d3 100644
--- a/sys/boot/pc98/boot2/asm.h
+++ b/sys/boot/pc98/boot2/asm.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.7  92/02/29  15:33:41  rpd
- *	$Id: asm.h,v 1.3 1997/02/22 09:43:04 peter Exp $
+ * $FreeBSD$
  */
 
 #define S_ARG0	 4(%esp)
diff --git a/sys/boot/pc98/boot2/bios.S b/sys/boot/pc98/boot2/bios.S
index 4c667444ac37a..88d9506c46b47 100644
--- a/sys/boot/pc98/boot2/bios.S
+++ b/sys/boot/pc98/boot2/bios.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- *	$Id: bios.S,v 1.9 1998/05/02 02:06:07 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/boot.c b/sys/boot/pc98/boot2/boot.c
index df9d7fcb18e15..df8e755062a32 100644
--- a/sys/boot/pc98/boot2/boot.c
+++ b/sys/boot/pc98/boot2/boot.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, [92/04/03  16:51:14  rvb]
- *	$Id: boot.c,v 1.2 1999/03/04 10:45:06 kato Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/boot/pc98/boot2/boot.h b/sys/boot/pc98/boot2/boot.h
index 2104071add6c4..4e32192eebc65 100644
--- a/sys/boot/pc98/boot2/boot.h
+++ b/sys/boot/pc98/boot2/boot.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:03  rpd
- *	$Id: boot.h,v 1.14 1998/10/11 15:08:50 kato Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/boot/pc98/boot2/disk.c b/sys/boot/pc98/boot2/disk.c
index 7aa768c57208c..ad9d3ff74d882 100644
--- a/sys/boot/pc98/boot2/disk.c
+++ b/sys/boot/pc98/boot2/disk.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:49  rpd
- *	$Id: disk.c,v 1.9 1997/05/28 09:22:59 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/io.c b/sys/boot/pc98/boot2/io.c
index 6047364469dfd..dc5fb00f94ce9 100644
--- a/sys/boot/pc98/boot2/io.c
+++ b/sys/boot/pc98/boot2/io.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:57  rpd
- *	$Id: io.c,v 1.13 1997/12/05 11:50:42 kato Exp $
+ * $FreeBSD$
  */
 
 #include "boot.h"
diff --git a/sys/boot/pc98/boot2/serial.S b/sys/boot/pc98/boot2/serial.S
index fed109ebdc5b9..166881517b1b8 100644
--- a/sys/boot/pc98/boot2/serial.S
+++ b/sys/boot/pc98/boot2/serial.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- *	$Id: serial.S,v 1.1 1999/02/03 08:39:08 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/start.S b/sys/boot/pc98/boot2/start.S
index 24459cdf6d049..a7e69355d621f 100644
--- a/sys/boot/pc98/boot2/start.S
+++ b/sys/boot/pc98/boot2/start.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:29  rpd
- *	$Id: start.S,v 1.6 1998/07/30 02:27:41 alex Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/sys.c b/sys/boot/pc98/boot2/sys.c
index 591d43214d9c7..1b138b36d4797 100644
--- a/sys/boot/pc98/boot2/sys.c
+++ b/sys/boot/pc98/boot2/sys.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:34  rpd
- *	$Id: sys.c,v 1.15 1998/05/02 02:06:08 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/pc98/boot2/table.c b/sys/boot/pc98/boot2/table.c
index 059ace23d035c..b6e113a014a8b 100644
--- a/sys/boot/pc98/boot2/table.c
+++ b/sys/boot/pc98/boot2/table.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:43  rpd
- *	$Id: table.c,v 1.1 1999/02/03 08:39:08 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/pc98/btx/Makefile b/sys/boot/pc98/btx/Makefile
index b4c19e54926e1..39f78ed639b9c 100644
--- a/sys/boot/pc98/btx/Makefile
+++ b/sys/boot/pc98/btx/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/02/03 08:39:08 kato Exp $
+# $FreeBSD$
 
 SUBDIR=	btx btxldr lib
 
diff --git a/sys/boot/pc98/btx/btx/Makefile b/sys/boot/pc98/btx/btx/Makefile
index b74deeaf18f17..a856eda530400 100644
--- a/sys/boot/pc98/btx/btx/Makefile
+++ b/sys/boot/pc98/btx/btx/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.5 1998/10/13 18:29:18 rnordier Exp $
+# $FreeBSD$
 
 M4?=	m4
 
diff --git a/sys/boot/pc98/btx/btx/btx.S b/sys/boot/pc98/btx/btx/btx.S
index d4e8d894ec069..eb191316c094b 100644
--- a/sys/boot/pc98/btx/btx/btx.S
+++ b/sys/boot/pc98/btx/btx/btx.S
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btx.s,v 1.1 1999/02/03 08:39:08 kato Exp $
+# $FreeBSD$
 
 #
 # Memory layout.
diff --git a/sys/boot/pc98/btx/btx/btx.m4 b/sys/boot/pc98/btx/btx/btx.m4
index 6526c6b29c6e7..70649bbb6c911 100644
--- a/sys/boot/pc98/btx/btx/btx.m4
+++ b/sys/boot/pc98/btx/btx/btx.m4
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btx.m4,v 1.1.1.1 1998/09/12 04:29:23 rnordier Exp $
+# $FreeBSD$
 
 define(_al,0x0)dnl
 define(_cl,0x1)dnl
diff --git a/sys/boot/pc98/btx/btx/btx.s b/sys/boot/pc98/btx/btx/btx.s
index d4e8d894ec069..eb191316c094b 100644
--- a/sys/boot/pc98/btx/btx/btx.s
+++ b/sys/boot/pc98/btx/btx/btx.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btx.s,v 1.1 1999/02/03 08:39:08 kato Exp $
+# $FreeBSD$
 
 #
 # Memory layout.
diff --git a/sys/boot/pc98/btx/btxldr/Makefile b/sys/boot/pc98/btx/btxldr/Makefile
index 5bd155c833175..b6f40162d23af 100644
--- a/sys/boot/pc98/btx/btxldr/Makefile
+++ b/sys/boot/pc98/btx/btxldr/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.6 1998/10/30 00:11:35 msmith Exp $
+# $FreeBSD$
 
 ORG=0x100000
 #AFLAGS+=	-x assembler-with-cpp
diff --git a/sys/boot/pc98/btx/btxldr/btxldr.S b/sys/boot/pc98/btx/btxldr/btxldr.S
index 6217eb234e7df..cc8c6a1c06d34 100644
--- a/sys/boot/pc98/btx/btxldr/btxldr.S
+++ b/sys/boot/pc98/btx/btxldr/btxldr.S
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btxldr.s,v 1.5 1999/01/22 13:07:17 rnordier Exp $
+# $FreeBSD$
 
 #
 # Prototype BTX loader program, written in a couple of hours.  The
diff --git a/sys/boot/pc98/btx/btxldr/btxldr.s b/sys/boot/pc98/btx/btxldr/btxldr.s
index 6217eb234e7df..cc8c6a1c06d34 100644
--- a/sys/boot/pc98/btx/btxldr/btxldr.s
+++ b/sys/boot/pc98/btx/btxldr/btxldr.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btxldr.s,v 1.5 1999/01/22 13:07:17 rnordier Exp $
+# $FreeBSD$
 
 #
 # Prototype BTX loader program, written in a couple of hours.  The
diff --git a/sys/boot/pc98/btx/lib/Makefile b/sys/boot/pc98/btx/lib/Makefile
index e47e653872ec4..40c65657ea7a9 100644
--- a/sys/boot/pc98/btx/lib/Makefile
+++ b/sys/boot/pc98/btx/lib/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1998/10/11 11:27:48 rnordier Exp $
+# $FreeBSD$
 
 OBJS=		btxcsu.o btxsys.o btxv86.o
 AFLAGS+=	-elf
diff --git a/sys/boot/pc98/btx/lib/btxcsu.s b/sys/boot/pc98/btx/lib/btxcsu.s
index 28b878be2416a..f08ae754f8269 100644
--- a/sys/boot/pc98/btx/lib/btxcsu.s
+++ b/sys/boot/pc98/btx/lib/btxcsu.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btxcsu.s,v 1.2 1998/10/04 21:15:45 rnordier Exp $
+# $FreeBSD$
 
 #
 # BTX C startup code (ELF).
diff --git a/sys/boot/pc98/btx/lib/btxsys.s b/sys/boot/pc98/btx/lib/btxsys.s
index 6273bfa45e7db..9c77b4295e7cf 100644
--- a/sys/boot/pc98/btx/lib/btxsys.s
+++ b/sys/boot/pc98/btx/lib/btxsys.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btxsys.s,v 1.1 1998/09/14 10:37:00 rnordier Exp $
+# $FreeBSD$
 
 #
 # BTX system calls.
diff --git a/sys/boot/pc98/btx/lib/btxv86.h b/sys/boot/pc98/btx/lib/btxv86.h
index 05708f2a3f215..1152f8b1d9635 100644
--- a/sys/boot/pc98/btx/lib/btxv86.h
+++ b/sys/boot/pc98/btx/lib/btxv86.h
@@ -14,7 +14,7 @@
  */
 
 /*
- *	$Id: btxv86.h,v 1.4 1998/10/02 20:52:26 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifndef _BTXV86_H_
diff --git a/sys/boot/pc98/btx/lib/btxv86.s b/sys/boot/pc98/btx/lib/btxv86.s
index 14b77674f3a53..0d7d1116322d2 100644
--- a/sys/boot/pc98/btx/lib/btxv86.s
+++ b/sys/boot/pc98/btx/lib/btxv86.s
@@ -13,7 +13,7 @@
 # purpose.
 #
 
-#	$Id: btxv86.s,v 1.2 1998/10/22 20:22:07 msmith Exp $
+# $FreeBSD$
 
 #
 # BTX V86 interface.
diff --git a/sys/boot/pc98/libpc98/Makefile b/sys/boot/pc98/libpc98/Makefile
index fad01497c9f3c..cde163e3e382a 100644
--- a/sys/boot/pc98/libpc98/Makefile
+++ b/sys/boot/pc98/libpc98/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.13 1999/01/10 14:48:04 rnordier Exp $
+# $FreeBSD$
 #
 LIB=			pc98
 NOPIC=
diff --git a/sys/boot/pc98/libpc98/biosdisk.c b/sys/boot/pc98/libpc98/biosdisk.c
index 169452f8104f6..a82ef4a2ec3f9 100644
--- a/sys/boot/pc98/libpc98/biosdisk.c
+++ b/sys/boot/pc98/libpc98/biosdisk.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: biosdisk.c,v 1.4 1999/08/05 03:12:20 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/boot/pc98/libpc98/bootinfo.c b/sys/boot/pc98/libpc98/bootinfo.c
index 92bb219b0bad8..6b780f1767ec6 100644
--- a/sys/boot/pc98/libpc98/bootinfo.c
+++ b/sys/boot/pc98/libpc98/bootinfo.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bootinfo.c,v 1.4 1999/06/06 12:46:40 kato Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/pc98/libpc98/comconsole.c b/sys/boot/pc98/libpc98/comconsole.c
index 82e4642e7cc53..958b4e01942a9 100644
--- a/sys/boot/pc98/libpc98/comconsole.c
+++ b/sys/boot/pc98/libpc98/comconsole.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: comconsole.c,v 1.6 1999/01/10 14:48:05 rnordier Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/pc98/libpc98/gatea20.c b/sys/boot/pc98/libpc98/gatea20.c
index 45e441012b55d..cad48c1badc32 100644
--- a/sys/boot/pc98/libpc98/gatea20.c
+++ b/sys/boot/pc98/libpc98/gatea20.c
@@ -1,5 +1,5 @@
 /*
- * $Id: gatea20.c,v 1.1.1.1 1998/08/21 03:17:41 msmith Exp $
+ * $FreeBSD$
  * From: $NetBSD: gatea20.c,v 1.2 1997/10/29 00:32:49 fvdl Exp $
  */
 
diff --git a/sys/boot/pc98/libpc98/vidconsole.c b/sys/boot/pc98/libpc98/vidconsole.c
index 7804b66667503..db62063a4328e 100644
--- a/sys/boot/pc98/libpc98/vidconsole.c
+++ b/sys/boot/pc98/libpc98/vidconsole.c
@@ -26,7 +26,7 @@
  *
  * 	From Id: probe_keyboard.c,v 1.13 1997/06/09 05:10:55 bde Exp
  *
- *	$Id: vidconsole.c,v 1.1 1999/02/03 08:39:09 kato Exp $
+ * $FreeBSD$
  */
 
 #include <stand.h>
diff --git a/sys/boot/pc98/loader/Makefile b/sys/boot/pc98/loader/Makefile
index e51a952db86c9..6d0af3895cdce 100644
--- a/sys/boot/pc98/loader/Makefile
+++ b/sys/boot/pc98/loader/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.7 1999/04/25 03:56:44 kato Exp $
+# $FreeBSD$
 
 BASE=		loader
 PROG=		${BASE}
diff --git a/sys/boot/pc98/loader/main.c b/sys/boot/pc98/loader/main.c
index 4b7aa2f010fbb..0fabadfe5b8e7 100644
--- a/sys/boot/pc98/loader/main.c
+++ b/sys/boot/pc98/loader/main.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: main.c,v 1.2 1999/03/04 10:48:14 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/cam/cam.c b/sys/cam/cam.c
index 4e11061752cde..4c28e42954fc3 100644
--- a/sys/cam/cam.c
+++ b/sys/cam/cam.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: cam.c,v 1.1 1998/09/15 06:33:23 gibbs Exp $
+ * $FreeBSD$
  */
 #include <sys/param.h>
 
diff --git a/sys/cam/cam.h b/sys/cam/cam.h
index c182fd6282870..7f656032eddc9 100644
--- a/sys/cam/cam.h
+++ b/sys/cam/cam.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: cam.h,v 1.1 1998/09/15 06:33:23 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef _CAM_CAM_H
diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h
index a44334568fb8e..c58a0a1b277bb 100644
--- a/sys/cam/cam_ccb.h
+++ b/sys/cam/cam_ccb.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: cam_ccb.h,v 1.8 1999/08/16 22:14:47 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef _CAM_CAM_CCB_H
diff --git a/sys/cam/cam_conf.h b/sys/cam/cam_conf.h
index 080575c66c602..fc777c17d3929 100644
--- a/sys/cam/cam_conf.h
+++ b/sys/cam/cam_conf.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id$
+ * $FreeBSD$
  */
 
 #ifndef _CAM_CAM_CONF_H
diff --git a/sys/cam/cam_debug.h b/sys/cam/cam_debug.h
index 6fa6d5282910d..aa1a50dec9b66 100644
--- a/sys/cam/cam_debug.h
+++ b/sys/cam/cam_debug.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: cam_debug.h,v 1.3 1998/12/05 23:55:48 mjacob Exp $
+ * $FreeBSD$
  */
 #ifndef	_CAM_CAM_DEBUG_H
 #define _CAM_CAM_DEBUG_H 1
diff --git a/sys/cam/cam_extend.c b/sys/cam/cam_extend.c
index 8570a35dd6c3c..0802febac4439 100644
--- a/sys/cam/cam_extend.c
+++ b/sys/cam/cam_extend.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- *      $Id: cam_extend.c,v 1.1 1998/09/15 06:33:23 gibbs Exp $
+ * $FreeBSD$
  */
 /*
  * XXX XXX XXX XXX  We should get DEVFS working so that we
diff --git a/sys/cam/cam_extend.h b/sys/cam/cam_extend.h
index 8aec51d391fed..21ade23b40ace 100644
--- a/sys/cam/cam_extend.h
+++ b/sys/cam/cam_extend.h
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- *      $Id$
+ * $FreeBSD$
  */
 
 #ifndef _CAM_CAM_EXTEND_H
diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c
index a73972cf05f69..6ed5ddf76ef07 100644
--- a/sys/cam/cam_periph.c
+++ b/sys/cam/cam_periph.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: cam_periph.c,v 1.18 1999/06/26 02:47:06 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/cam/cam_periph.h b/sys/cam/cam_periph.h
index 2efee41c44619..acb7bd643391e 100644
--- a/sys/cam/cam_periph.h
+++ b/sys/cam/cam_periph.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: cam_periph.h,v 1.3 1998/10/22 22:16:48 ken Exp $
+ * $FreeBSD$
  */
 
 #ifndef _CAM_CAM_PERIPH_H
diff --git a/sys/cam/cam_queue.c b/sys/cam/cam_queue.c
index 3ec7ad2006f93..988a1a2f42e3e 100644
--- a/sys/cam/cam_queue.c
+++ b/sys/cam/cam_queue.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: cam_queue.c,v 1.3 1999/04/19 21:26:08 gibbs Exp $
+ * $FreeBSD$
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/cam/cam_queue.h b/sys/cam/cam_queue.h
index 36685259755ab..d3459315a7c97 100644
--- a/sys/cam/cam_queue.h
+++ b/sys/cam/cam_queue.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: cam_queue.h,v 1.3 1999/04/07 22:57:48 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef _CAM_CAM_QUEUE_H
diff --git a/sys/cam/cam_sim.c b/sys/cam/cam_sim.c
index feaf9ed694914..c8843e24c825b 100644
--- a/sys/cam/cam_sim.c
+++ b/sys/cam/cam_sim.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: cam_sim.c,v 1.1 1998/09/15 06:33:23 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/cam/cam_sim.h b/sys/cam/cam_sim.h
index 53e7937b85702..532504911633e 100644
--- a/sys/cam/cam_sim.h
+++ b/sys/cam/cam_sim.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: cam_sim.h,v 1.1 1998/09/15 06:33:23 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef _CAM_CAM_SIM_H
diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index 0f92c6e3fac6f..d203aa1e94ca4 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: cam_xpt.c,v 1.67 1999/08/16 22:22:41 gibbs Exp $
+ * $FreeBSD$
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/cam/cam_xpt.h b/sys/cam/cam_xpt.h
index 0ed413d9dfa69..6d41f6c52f788 100644
--- a/sys/cam/cam_xpt.h
+++ b/sys/cam/cam_xpt.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id$
+ * $FreeBSD$
  */
 
 #ifndef _CAM_CAM_XPT_H
diff --git a/sys/cam/cam_xpt_periph.h b/sys/cam/cam_xpt_periph.h
index ee64e213ae942..111402f045040 100644
--- a/sys/cam/cam_xpt_periph.h
+++ b/sys/cam/cam_xpt_periph.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id$
+ * $FreeBSD$
  */
 
 #ifndef _CAM_CAM_XPT_PERIPH_H
diff --git a/sys/cam/cam_xpt_sim.h b/sys/cam/cam_xpt_sim.h
index 267deeb7e4f08..698e638dddb6d 100644
--- a/sys/cam/cam_xpt_sim.h
+++ b/sys/cam/cam_xpt_sim.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: cam_xpt_sim.h,v 1.3 1999/03/05 23:18:56 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef _CAM_CAM_XPT_SIM_H
diff --git a/sys/cam/scsi/scsi_all.c b/sys/cam/scsi/scsi_all.c
index 1203699e78d54..a1ea40251e2af 100644
--- a/sys/cam/scsi/scsi_all.c
+++ b/sys/cam/scsi/scsi_all.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: scsi_all.c,v 1.8 1998/12/06 00:05:47 mjacob Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/cam/scsi/scsi_all.h b/sys/cam/scsi/scsi_all.h
index 9ced6c3c5fa62..d6d802bfceac9 100644
--- a/sys/cam/scsi/scsi_all.h
+++ b/sys/cam/scsi/scsi_all.h
@@ -14,7 +14,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *	$Id: scsi_all.h,v 1.7 1999/05/09 01:25:22 ken Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index f57ef1a8e9506..a6d4ac819af77 100644
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: scsi_cd.c,v 1.23 1999/05/31 11:23:58 phk Exp $
+ * $FreeBSD$
  */
 /*
  * Portions of this driver taken from the original FreeBSD cd driver.
diff --git a/sys/cam/scsi/scsi_ch.c b/sys/cam/scsi/scsi_ch.c
index 537090037e8a6..fd681a65f24ca 100644
--- a/sys/cam/scsi/scsi_ch.c
+++ b/sys/cam/scsi/scsi_ch.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: scsi_ch.c,v 1.14 1999/05/31 11:24:00 phk Exp $
+ * $FreeBSD$
  */
 /*
  * Derived from the NetBSD SCSI changer driver.
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index ac0af545f637d..bcd752dc8a324 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: scsi_da.c,v 1.34 1999/08/21 06:23:50 msmith Exp $
+ * $FreeBSD$
  */
 
 #include "opt_hw_wdog.h"
diff --git a/sys/cam/scsi/scsi_da.h b/sys/cam/scsi/scsi_da.h
index d9b95e319e130..88a0fcd81bb99 100644
--- a/sys/cam/scsi/scsi_da.h
+++ b/sys/cam/scsi/scsi_da.h
@@ -46,7 +46,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *	$Id: scsi_da.h,v 1.1 1998/09/15 06:36:34 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SCSI_SCSI_DA_H
diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c
index b900c3b02f552..958e1664de181 100644
--- a/sys/cam/scsi/scsi_pass.c
+++ b/sys/cam/scsi/scsi_pass.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: scsi_pass.c,v 1.12 1999/05/31 11:24:05 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/cam/scsi/scsi_pass.h b/sys/cam/scsi/scsi_pass.h
index 12ad2e207c8fb..39e92c35227ed 100644
--- a/sys/cam/scsi/scsi_pass.h
+++ b/sys/cam/scsi/scsi_pass.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: scsi_pass.h,v 1.1 1998/09/15 06:36:34 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SCSI_PASS_H
diff --git a/sys/cam/scsi/scsi_pt.c b/sys/cam/scsi/scsi_pt.c
index 92ed7b9b1053f..72350cb15c3e9 100644
--- a/sys/cam/scsi/scsi_pt.c
+++ b/sys/cam/scsi/scsi_pt.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: scsi_pt.c,v 1.11 1999/08/17 20:25:47 billf Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/cam/scsi/scsi_pt.h b/sys/cam/scsi/scsi_pt.h
index d965ee22b6e54..b5eea824fcf6c 100644
--- a/sys/cam/scsi/scsi_pt.h
+++ b/sys/cam/scsi/scsi_pt.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SCSI_SCSI_PT_H
diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c
index d393884ddada3..d1d152755f526 100644
--- a/sys/cam/scsi/scsi_sa.c
+++ b/sys/cam/scsi/scsi_sa.c
@@ -1,5 +1,5 @@
 /*
- * $Id: scsi_sa.c,v 1.29 1999/06/24 15:21:10 mjacob Exp $
+ * $FreeBSD$
  *
  * Implementation of SCSI Sequential Access Peripheral driver for CAM.
  *
diff --git a/sys/cam/scsi/scsi_sa.h b/sys/cam/scsi/scsi_sa.h
index ab2d1bc15a26e..be52eca28567f 100644
--- a/sys/cam/scsi/scsi_sa.h
+++ b/sys/cam/scsi/scsi_sa.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: scsi_sa.h,v 1.4 1999/02/05 07:19:23 mjacob Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SCSI_SCSI_SA_H
diff --git a/sys/cam/scsi/scsi_targ_bh.c b/sys/cam/scsi/scsi_targ_bh.c
index 3775b4d62b415..c5a5ec5c22e00 100644
--- a/sys/cam/scsi/scsi_targ_bh.c
+++ b/sys/cam/scsi/scsi_targ_bh.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: scsi_targ_bh.c,v 1.1 1999/01/14 06:00:29 gibbs Exp $
+ * $FreeBSD$
  */
 #include <stddef.h>	/* For offsetof */
 
diff --git a/sys/cam/scsi/scsi_target.c b/sys/cam/scsi/scsi_target.c
index 5e7afc5610baf..70a50ea52afc4 100644
--- a/sys/cam/scsi/scsi_target.c
+++ b/sys/cam/scsi/scsi_target.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: scsi_target.c,v 1.14 1999/05/31 11:24:11 phk Exp $
+ * $FreeBSD$
  */
 #include <stddef.h>	/* For offsetof */
 
diff --git a/sys/cam/scsi/scsi_targetio.h b/sys/cam/scsi/scsi_targetio.h
index 9c5c0595d184f..d20c9b08fbc2c 100644
--- a/sys/cam/scsi/scsi_targetio.h
+++ b/sys/cam/scsi/scsi_targetio.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: scsi_targetio.h,v 1.2 1999/03/05 23:25:11 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef _CAM_SCSI_SCSI_TARGETIO_H_
diff --git a/sys/coda/cnode.h b/sys/coda/cnode.h
index ee4573d510207..75d29acc22ed5 100644
--- a/sys/coda/cnode.h
+++ b/sys/coda/cnode.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/cnode.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: cnode.h,v 1.5 1998/11/11 20:32:20 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda.h b/sys/coda/coda.h
index db2ec539b003f..5a25bc67f152c 100644
--- a/sys/coda/coda.h
+++ b/sys/coda/coda.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda.h,v 1.6 1998/11/11 20:32:20 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_fbsd.c b/sys/coda/coda_fbsd.c
index 22a5963acd298..ea16d154b4f74 100644
--- a/sys/coda/coda_fbsd.c
+++ b/sys/coda/coda_fbsd.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_fbsd.cr,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_fbsd.c,v 1.15 1999/05/31 11:24:16 phk Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_io.h b/sys/coda/coda_io.h
index e896ff0813b74..6620f4f0c32e8 100644
--- a/sys/coda/coda_io.h
+++ b/sys/coda/coda_io.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_io.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_io.h,v 1.4 1998/09/13 13:57:59 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_kernel.h b/sys/coda/coda_kernel.h
index 33b372f49b139..cc0fd957f81c0 100644
--- a/sys/coda/coda_kernel.h
+++ b/sys/coda/coda_kernel.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_kernel.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_kernel.h,v 1.2 1998/09/02 19:09:53 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_namecache.c b/sys/coda/coda_namecache.c
index 63ee9f9772f7d..23425b5a13dda 100644
--- a/sys/coda/coda_namecache.c
+++ b/sys/coda/coda_namecache.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_namecache.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_namecache.c,v 1.8 1998/10/28 19:33:50 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_namecache.h b/sys/coda/coda_namecache.h
index e4739114c2c8a..11f2e80b12b29 100644
--- a/sys/coda/coda_namecache.h
+++ b/sys/coda/coda_namecache.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_namecache.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_namecache.h,v 1.4 1998/09/13 13:57:59 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_opstats.h b/sys/coda/coda_opstats.h
index e62c04d3db1fc..8661a07ebfa0c 100644
--- a/sys/coda/coda_opstats.h
+++ b/sys/coda/coda_opstats.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_opstats.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_opstats.h,v 1.3 1998/09/11 18:50:17 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_pioctl.h b/sys/coda/coda_pioctl.h
index 57bc67ed00219..2c2577ce57eed 100644
--- a/sys/coda/coda_pioctl.h
+++ b/sys/coda/coda_pioctl.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_pioctl.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_pioctl.h,v 1.4 1998/09/13 13:57:59 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_psdev.c b/sys/coda/coda_psdev.c
index cde967f04c9bd..520702ba48d2d 100644
--- a/sys/coda/coda_psdev.c
+++ b/sys/coda/coda_psdev.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_psdev.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_psdev.c,v 1.10 1999/01/17 21:04:53 peter Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_psdev.h b/sys/coda/coda_psdev.h
index 11922adfe02c5..c6276f3e710ca 100644
--- a/sys/coda/coda_psdev.h
+++ b/sys/coda/coda_psdev.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_psdev.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_psdev.c,v 1.4 1998/09/13 13:57:59 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_subr.c b/sys/coda/coda_subr.c
index f64123321f3b3..aaf805c54ad62 100644
--- a/sys/coda/coda_subr.c
+++ b/sys/coda/coda_subr.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_subr.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_subr.c,v 1.9 1999/01/17 20:25:15 peter Exp $
+ * $FreeBSD$
  * 
   */
 
diff --git a/sys/coda/coda_subr.h b/sys/coda/coda_subr.h
index fe27bfda19ce8..71c8a3de38124 100644
--- a/sys/coda/coda_subr.h
+++ b/sys/coda/coda_subr.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_subr.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_subr.h,v 1.5 1998/09/13 13:57:59 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_venus.c b/sys/coda/coda_venus.c
index 9853c7e834bbc..f27357498d459 100644
--- a/sys/coda/coda_venus.c
+++ b/sys/coda/coda_venus.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/cfs/coda_venus.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_venus.c,v 1.7 1999/05/11 19:53:51 phk Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_venus.h b/sys/coda/coda_venus.h
index 6fdd15c60fada..392a73f071147 100644
--- a/sys/coda/coda_venus.h
+++ b/sys/coda/coda_venus.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_venus.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_venus.h,v 1.2 1998/09/02 19:09:53 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_vfsops.c b/sys/coda/coda_vfsops.c
index fda83939beb52..35959df042397 100644
--- a/sys/coda/coda_vfsops.c
+++ b/sys/coda/coda_vfsops.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  *  	@(#) src/sys/cfs/coda_vfsops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_vfsops.c,v 1.16 1999/07/21 12:51:36 phk Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_vfsops.h b/sys/coda/coda_vfsops.h
index ef23c3fd3828f..13a006d1b1c7f 100644
--- a/sys/coda/coda_vfsops.h
+++ b/sys/coda/coda_vfsops.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/cfs/coda_vfsops.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_vfsops.h,v 1.2 1998/09/02 19:09:53 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_vnops.c b/sys/coda/coda_vnops.c
index b0a9bedec0cb7..6614b4b2c508d 100644
--- a/sys/coda/coda_vnops.c
+++ b/sys/coda/coda_vnops.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  *  	@(#) src/sys/coda/coda_vnops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_vnops.c,v 1.17 1999/08/08 13:22:05 bde Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/coda/coda_vnops.h b/sys/coda/coda_vnops.h
index d188eb6fe5ff6..0fb598582d751 100644
--- a/sys/coda/coda_vnops.h
+++ b/sys/coda/coda_vnops.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_vnops.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_vnops.h,v 1.4 1998/09/13 13:57:59 rvb Exp $
+ * $FreeBSD$
  * 
   */
 
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c
index a5b051fd1be90..b0e8a367c83a5 100644
--- a/sys/compat/linux/linux_file.c
+++ b/sys/compat/linux/linux_file.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_file.c,v 1.30 1999/08/14 18:20:44 marcel Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c
index 53becd770429c..56a0eda42066e 100644
--- a/sys/compat/linux/linux_ioctl.c
+++ b/sys/compat/linux/linux_ioctl.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_ioctl.c,v 1.40 1999/08/14 13:26:44 marcel Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c
index 7315fa9c23868..5efee536adb3f 100644
--- a/sys/compat/linux/linux_ipc.c
+++ b/sys/compat/linux/linux_ipc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_ipc.c,v 1.13 1997/11/06 19:28:57 phk Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index 74fb7319be802..98348750170d4 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_misc.c,v 1.67 1999/08/25 14:11:01 marcel Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c
index 29b5c4c3ebf0b..9f2200e526a69 100644
--- a/sys/compat/linux/linux_signal.c
+++ b/sys/compat/linux/linux_signal.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_signal.c,v 1.16 1999/07/06 06:54:00 cracauer Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c
index e757fc13c7f81..d29efb63d85de 100644
--- a/sys/compat/linux/linux_socket.c
+++ b/sys/compat/linux/linux_socket.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_socket.c,v 1.14 1998/12/30 21:20:00 sos Exp $
+ * $FreeBSD$
  */
 
 /* XXX we use functions that might not exist. */
diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c
index bfa11f642edbe..b1fc1a4e5ee82 100644
--- a/sys/compat/linux/linux_stats.c
+++ b/sys/compat/linux/linux_stats.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_stats.c,v 1.12 1999/05/11 19:54:20 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/compat/linux/linux_util.c b/sys/compat/linux/linux_util.c
index 11739158917af..7c87174089a91 100644
--- a/sys/compat/linux/linux_util.c
+++ b/sys/compat/linux/linux_util.c
@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from: svr4_util.c,v 1.5 1995/01/22 23:44:50 christos Exp
- *	$Id: linux_util.c,v 1.6 1997/03/24 11:24:31 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/compat/linux/linux_util.h b/sys/compat/linux/linux_util.h
index 2905f00ca4ef1..61a637171083e 100644
--- a/sys/compat/linux/linux_util.h
+++ b/sys/compat/linux/linux_util.h
@@ -28,7 +28,7 @@
  *
  * from: svr4_util.h,v 1.5 1994/11/18 02:54:31 christos Exp
  * from: linux_util.h,v 1.2 1995/03/05 23:23:50 fvdl Exp
- * $Id: linux_util.h,v 1.7 1998/12/16 16:28:57 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/compat/svr4/Makefile b/sys/compat/svr4/Makefile
index d8fd59b7fb3cb..670fccb6a6688 100644
--- a/sys/compat/svr4/Makefile
+++ b/sys/compat/svr4/Makefile
@@ -1,6 +1,6 @@
 # Makefile for syscall tables
 #
-# $Id: Makefile,v 1.3 1997/03/29 11:17:26 peter Exp $
+# $FreeBSD$
 
 all:
 	@echo "make svr4_sysent.c only"
diff --git a/sys/compat/svr4/imgact_svr4.c b/sys/compat/svr4/imgact_svr4.c
index 5fcfcb5bafcae..707e7e4d3ac4d 100644
--- a/sys/compat/svr4/imgact_svr4.c
+++ b/sys/compat/svr4/imgact_svr4.c
@@ -29,7 +29,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/compat/svr4/svr4.h b/sys/compat/svr4/svr4.h
index a42d49d4f9d44..52910bf349c36 100644
--- a/sys/compat/svr4/svr4.h
+++ b/sys/compat/svr4/svr4.h
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #if !defined(_SVR4_H)
diff --git a/sys/compat/svr4/svr4_acl.h b/sys/compat/svr4/svr4_acl.h
index f1a405f2fd6a8..6d9454f65ecd3 100644
--- a/sys/compat/svr4/svr4_acl.h
+++ b/sys/compat/svr4/svr4_acl.h
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifndef	_SVR4_ACL_H_
 #define	_SVR4_ACL_H_
diff --git a/sys/compat/svr4/svr4_dirent.h b/sys/compat/svr4/svr4_dirent.h
index 26ee8164aeb0f..2440782278889 100644
--- a/sys/compat/svr4/svr4_dirent.h
+++ b/sys/compat/svr4/svr4_dirent.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_DIRENT_H_
diff --git a/sys/compat/svr4/svr4_errno.h b/sys/compat/svr4/svr4_errno.h
index 50dd46a43127c..cc39929acfd5f 100644
--- a/sys/compat/svr4/svr4_errno.h
+++ b/sys/compat/svr4/svr4_errno.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_ERRNO_H_
diff --git a/sys/compat/svr4/svr4_exec.h b/sys/compat/svr4/svr4_exec.h
index 301915940bd3a..716dad18924a7 100644
--- a/sys/compat/svr4/svr4_exec.h
+++ b/sys/compat/svr4/svr4_exec.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_EXEC_H_
diff --git a/sys/compat/svr4/svr4_fcntl.c b/sys/compat/svr4/svr4_fcntl.c
index add04e382f73a..60b975966a4b5 100644
--- a/sys/compat/svr4/svr4_fcntl.c
+++ b/sys/compat/svr4/svr4_fcntl.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_fcntl.c,v 1.3 1999/07/30 12:45:15 newton Exp $
+ * $FreeBSD$
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/svr4/svr4_fcntl.h b/sys/compat/svr4/svr4_fcntl.h
index 6ee21fae8339c..615e09c219fbd 100644
--- a/sys/compat/svr4/svr4_fcntl.h
+++ b/sys/compat/svr4/svr4_fcntl.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_FCNTL_H_
diff --git a/sys/compat/svr4/svr4_filio.c b/sys/compat/svr4/svr4_filio.c
index 9dfeced92f6b7..0be9f221c7bc2 100644
--- a/sys/compat/svr4/svr4_filio.c
+++ b/sys/compat/svr4/svr4_filio.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/compat/svr4/svr4_filio.h b/sys/compat/svr4/svr4_filio.h
index 254e2da813c73..37184cb72610b 100644
--- a/sys/compat/svr4/svr4_filio.h
+++ b/sys/compat/svr4/svr4_filio.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_FILIO_H_
diff --git a/sys/compat/svr4/svr4_fuser.h b/sys/compat/svr4/svr4_fuser.h
index bc726c12cefa7..25cdcf13e0be3 100644
--- a/sys/compat/svr4/svr4_fuser.h
+++ b/sys/compat/svr4/svr4_fuser.h
@@ -1,5 +1,5 @@
 /*
- *	$Id$
+ * $FreeBSD$
  *	Derived from:
  *	$NetBSD: svr4_fuser.h,v 1.4 1998/09/04 19:54:38 christos Exp $	 */
 
diff --git a/sys/compat/svr4/svr4_hrt.h b/sys/compat/svr4/svr4_hrt.h
index 8fc0231f46459..c160b8eeb6e9f 100644
--- a/sys/compat/svr4/svr4_hrt.h
+++ b/sys/compat/svr4/svr4_hrt.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_HRT_H_
diff --git a/sys/compat/svr4/svr4_ioctl.c b/sys/compat/svr4/svr4_ioctl.c
index 02c120217636c..401c58b2a9602 100644
--- a/sys/compat/svr4/svr4_ioctl.c
+++ b/sys/compat/svr4/svr4_ioctl.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/compat/svr4/svr4_ioctl.h b/sys/compat/svr4/svr4_ioctl.h
index f95e5ee534539..a5c6a53241811 100644
--- a/sys/compat/svr4/svr4_ioctl.h
+++ b/sys/compat/svr4/svr4_ioctl.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_IOCTL_H_
diff --git a/sys/compat/svr4/svr4_ipc.c b/sys/compat/svr4/svr4_ipc.c
index 1f9b7573cc72d..f884fa16c4edc 100644
--- a/sys/compat/svr4/svr4_ipc.c
+++ b/sys/compat/svr4/svr4_ipc.c
@@ -1,5 +1,5 @@
 /*
- *	$Id$
+ * $FreeBSD$
  *	Derived from:
  *	$NetBSD: svr4_ipc.c,v 1.7 1998/10/19 22:43:00 tron Exp $	*/
 
diff --git a/sys/compat/svr4/svr4_ipc.h b/sys/compat/svr4/svr4_ipc.h
index 56d7f5572be7b..6aadb7e050eca 100644
--- a/sys/compat/svr4/svr4_ipc.h
+++ b/sys/compat/svr4/svr4_ipc.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SVR4_IPC_H_
diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c
index 35aa8e603e6e4..9535cba8972b7 100644
--- a/sys/compat/svr4/svr4_misc.c
+++ b/sys/compat/svr4/svr4_misc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_misc.c,v 1.4 1999/07/30 12:45:16 newton Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/compat/svr4/svr4_mman.h b/sys/compat/svr4/svr4_mman.h
index 77500fad8a3d2..db7c3dacef5f1 100644
--- a/sys/compat/svr4/svr4_mman.h
+++ b/sys/compat/svr4/svr4_mman.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SVR4_MMAN_H_
diff --git a/sys/compat/svr4/svr4_resource.c b/sys/compat/svr4/svr4_resource.c
index 32717998d72e2..7c39f44b3a1ed 100644
--- a/sys/compat/svr4/svr4_resource.c
+++ b/sys/compat/svr4/svr4_resource.c
@@ -39,7 +39,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/compat/svr4/svr4_resource.h b/sys/compat/svr4/svr4_resource.h
index caab421cd6c6d..3512df387674d 100644
--- a/sys/compat/svr4/svr4_resource.h
+++ b/sys/compat/svr4/svr4_resource.h
@@ -38,7 +38,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/compat/svr4/svr4_siginfo.h b/sys/compat/svr4/svr4_siginfo.h
index 0f4c3e28f7cca..be898374dc2be 100644
--- a/sys/compat/svr4/svr4_siginfo.h
+++ b/sys/compat/svr4/svr4_siginfo.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_SIGINFO_H_
diff --git a/sys/compat/svr4/svr4_signal.c b/sys/compat/svr4/svr4_signal.c
index 2e1e088f902fb..b1239871942d2 100644
--- a/sys/compat/svr4/svr4_signal.c
+++ b/sys/compat/svr4/svr4_signal.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/compat/svr4/svr4_signal.h b/sys/compat/svr4/svr4_signal.h
index 0b02985068d4d..8fb861d201474 100644
--- a/sys/compat/svr4/svr4_signal.h
+++ b/sys/compat/svr4/svr4_signal.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_SIGNAL_H_
diff --git a/sys/compat/svr4/svr4_socket.c b/sys/compat/svr4/svr4_socket.c
index f42690071599a..e2eafa304e5d2 100644
--- a/sys/compat/svr4/svr4_socket.c
+++ b/sys/compat/svr4/svr4_socket.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_socket.c,v 1.2 1999/07/30 12:45:17 newton Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/compat/svr4/svr4_socket.h b/sys/compat/svr4/svr4_socket.h
index e7ee86b9b5f8b..96e3582738fb9 100644
--- a/sys/compat/svr4/svr4_socket.h
+++ b/sys/compat/svr4/svr4_socket.h
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_socket.h,v 1.2 1999/07/30 12:45:18 newton Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SVR4_SOCKET_H_
diff --git a/sys/compat/svr4/svr4_sockio.c b/sys/compat/svr4/svr4_sockio.c
index c0c9767bc6d6c..7d6184612762e 100644
--- a/sys/compat/svr4/svr4_sockio.c
+++ b/sys/compat/svr4/svr4_sockio.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/compat/svr4/svr4_sockio.h b/sys/compat/svr4/svr4_sockio.h
index f363caaddcbbf..dd4e220c9f488 100644
--- a/sys/compat/svr4/svr4_sockio.h
+++ b/sys/compat/svr4/svr4_sockio.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_SOCKIO_H_
diff --git a/sys/compat/svr4/svr4_sockmod.h b/sys/compat/svr4/svr4_sockmod.h
index 36e0a8a24b606..927ba0d283675 100644
--- a/sys/compat/svr4/svr4_sockmod.h
+++ b/sys/compat/svr4/svr4_sockmod.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_SOCKMOD_H_
diff --git a/sys/compat/svr4/svr4_stat.c b/sys/compat/svr4/svr4_stat.c
index 2b6755127dd0d..9ffcbc58d7542 100644
--- a/sys/compat/svr4/svr4_stat.c
+++ b/sys/compat/svr4/svr4_stat.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/compat/svr4/svr4_stat.h b/sys/compat/svr4/svr4_stat.h
index 082cb409f7868..7eeff44f30acf 100644
--- a/sys/compat/svr4/svr4_stat.h
+++ b/sys/compat/svr4/svr4_stat.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_STAT_H_
diff --git a/sys/compat/svr4/svr4_statvfs.h b/sys/compat/svr4/svr4_statvfs.h
index cc904abb89e3e..b3bf473a1b52c 100644
--- a/sys/compat/svr4/svr4_statvfs.h
+++ b/sys/compat/svr4/svr4_statvfs.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_STATVFS_H_
diff --git a/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c
index 41709258bd8ce..4ced1bc07f3a6 100644
--- a/sys/compat/svr4/svr4_stream.c
+++ b/sys/compat/svr4/svr4_stream.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_stream.c,v 1.2 1999/07/30 12:45:18 newton Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/compat/svr4/svr4_stropts.h b/sys/compat/svr4/svr4_stropts.h
index 52badbb502ef1..2fa14a1e988a7 100644
--- a/sys/compat/svr4/svr4_stropts.h
+++ b/sys/compat/svr4/svr4_stropts.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_STROPTS_H_
diff --git a/sys/compat/svr4/svr4_sysconfig.h b/sys/compat/svr4/svr4_sysconfig.h
index 331fa7ebaa0fc..874c5653e634d 100644
--- a/sys/compat/svr4/svr4_sysconfig.h
+++ b/sys/compat/svr4/svr4_sysconfig.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_SYSCONFIG_H_
diff --git a/sys/compat/svr4/svr4_systeminfo.h b/sys/compat/svr4/svr4_systeminfo.h
index 0e05a658d0b7e..40bc2b85d7570 100644
--- a/sys/compat/svr4/svr4_systeminfo.h
+++ b/sys/compat/svr4/svr4_systeminfo.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_SYSTEMINFO_H_
diff --git a/sys/compat/svr4/svr4_sysvec.c b/sys/compat/svr4/svr4_sysvec.c
index 95427ec67a94a..099bb9c4dfa9f 100644
--- a/sys/compat/svr4/svr4_sysvec.c
+++ b/sys/compat/svr4/svr4_sysvec.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_sysvec.c,v 1.4 1999/07/30 12:45:19 newton Exp $
+ * $FreeBSD$
  */
 
 /* XXX we use functions that might not exist. */
diff --git a/sys/compat/svr4/svr4_termios.c b/sys/compat/svr4/svr4_termios.c
index 45525a2306077..450c0847a99e6 100644
--- a/sys/compat/svr4/svr4_termios.c
+++ b/sys/compat/svr4/svr4_termios.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/compat/svr4/svr4_termios.h b/sys/compat/svr4/svr4_termios.h
index f7eddd443667c..8afa4f321bc36 100644
--- a/sys/compat/svr4/svr4_termios.h
+++ b/sys/compat/svr4/svr4_termios.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_TERMIOS_H_
diff --git a/sys/compat/svr4/svr4_time.h b/sys/compat/svr4/svr4_time.h
index cc9d7a7a18651..3d61771fc9045 100644
--- a/sys/compat/svr4/svr4_time.h
+++ b/sys/compat/svr4/svr4_time.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_TIME_H_
diff --git a/sys/compat/svr4/svr4_timod.h b/sys/compat/svr4/svr4_timod.h
index 7d98e05d782ca..f0c508f511b8d 100644
--- a/sys/compat/svr4/svr4_timod.h
+++ b/sys/compat/svr4/svr4_timod.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_TIMOD_H_
diff --git a/sys/compat/svr4/svr4_ttold.c b/sys/compat/svr4/svr4_ttold.c
index ac4c1d62c8ef5..d597691cc6998 100644
--- a/sys/compat/svr4/svr4_ttold.c
+++ b/sys/compat/svr4/svr4_ttold.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/compat/svr4/svr4_ttold.h b/sys/compat/svr4/svr4_ttold.h
index 81ea51448fd54..c578170a1ef9d 100644
--- a/sys/compat/svr4/svr4_ttold.h
+++ b/sys/compat/svr4/svr4_ttold.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_TTOLD_H_
diff --git a/sys/compat/svr4/svr4_types.h b/sys/compat/svr4/svr4_types.h
index 2aed74e4ff845..410746b6adc9c 100644
--- a/sys/compat/svr4/svr4_types.h
+++ b/sys/compat/svr4/svr4_types.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_TYPES_H_
diff --git a/sys/compat/svr4/svr4_ucontext.h b/sys/compat/svr4/svr4_ucontext.h
index c37865283da69..04bebe6eb81e6 100644
--- a/sys/compat/svr4/svr4_ucontext.h
+++ b/sys/compat/svr4/svr4_ucontext.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_UCONTEXT_H_
diff --git a/sys/compat/svr4/svr4_ulimit.h b/sys/compat/svr4/svr4_ulimit.h
index bd83d721abbd5..0735d42f722f0 100644
--- a/sys/compat/svr4/svr4_ulimit.h
+++ b/sys/compat/svr4/svr4_ulimit.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_ULIMIT_H_
diff --git a/sys/compat/svr4/svr4_ustat.h b/sys/compat/svr4/svr4_ustat.h
index 3c805a4feb43b..0033c96bae0d8 100644
--- a/sys/compat/svr4/svr4_ustat.h
+++ b/sys/compat/svr4/svr4_ustat.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_USTAT_H_
diff --git a/sys/compat/svr4/svr4_util.h b/sys/compat/svr4/svr4_util.h
index a2f28e340416d..629edd69cd4a3 100644
--- a/sys/compat/svr4/svr4_util.h
+++ b/sys/compat/svr4/svr4_util.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_util.h,v 1.2 1999/07/30 12:45:21 newton Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_UTIL_H_
diff --git a/sys/compat/svr4/svr4_utsname.h b/sys/compat/svr4/svr4_utsname.h
index e104778c9d17d..a3714c9b1c10b 100644
--- a/sys/compat/svr4/svr4_utsname.h
+++ b/sys/compat/svr4/svr4_utsname.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_UTSNAME_H_
diff --git a/sys/compat/svr4/svr4_wait.h b/sys/compat/svr4/svr4_wait.h
index 2945c19482757..9a92c0114c1c1 100644
--- a/sys/compat/svr4/svr4_wait.h
+++ b/sys/compat/svr4/svr4_wait.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_WAIT_H_
diff --git a/sys/compat/svr4/syscalls.conf b/sys/compat/svr4/syscalls.conf
index 5c01a85cad74a..46f7bd3df7be0 100644
--- a/sys/compat/svr4/syscalls.conf
+++ b/sys/compat/svr4/syscalls.conf
@@ -1,4 +1,4 @@
-# $Id: syscalls.conf,v 1.4 1998/03/13 19:13:54 jb Exp $
+# $FreeBSD$
 sysnames="svr4_syscallnames.c"
 sysproto="svr4_proto.h"
 sysproto_h=_SVR4_SYSPROTO_H_
diff --git a/sys/compat/svr4/syscalls.master b/sys/compat/svr4/syscalls.master
index 703120d7d2369..43e8f4886c68a 100644
--- a/sys/compat/svr4/syscalls.master
+++ b/sys/compat/svr4/syscalls.master
@@ -20,7 +20,7 @@
 ;	OBSOL	obsolete, not included in system, only specifies name
 ;	UNIMPL	not implemented, placeholder only
 ;
-; $Id: syscalls.master,v 1.2 1999/07/30 12:45:21 newton Exp $
+; $FreeBSD$
 ;
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index d6d3c1a063b79..dfd267a69063f 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -1,7 +1,7 @@
 # Makefile.alpha -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.alpha	7.1 5/10/91
-#	$Id: Makefile.alpha,v 1.28 1999/07/02 04:16:57 mjacob Exp $
+# $FreeBSD$
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 66873d0cc1e97..0d82e7971baa8 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.157 1999/07/02 04:00:01 jkh Exp $
+# $FreeBSD$
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index 8740d2398e81c..48492d5fc6eae 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -3,7 +3,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.pc98,v 1.66 1999/07/03 08:17:40 kato Exp $
+# $FreeBSD$
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 66873d0cc1e97..0d82e7971baa8 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.157 1999/07/02 04:00:01 jkh Exp $
+# $FreeBSD$
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 80ecf1a81a2b8..6c0f0cf935d3b 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.629 1999/08/21 17:40:37 wpaul Exp $
+# $FreeBSD$
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
diff --git a/sys/conf/files.alpha b/sys/conf/files.alpha
index 52ef13c794ff3..73d380047bc5b 100644
--- a/sys/conf/files.alpha
+++ b/sys/conf/files.alpha
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.alpha,v 1.23 1999/07/03 19:19:30 peter Exp $
+# $FreeBSD$
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 72349659ad1db..e6a940c18e111 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.259 1999/08/18 04:08:14 alc Exp $
+# $FreeBSD$
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index 359b379f40304..84d3f62a989bc 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -3,7 +3,7 @@
 #
 # modified for PC-9801
 #
-#	$Id: files.pc98,v 1.105 1999/08/09 10:34:59 phk Exp $
+# $FreeBSD$
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/conf/majors b/sys/conf/majors
index 60feb64f5cf15..e4fda55c344f2 100644
--- a/sys/conf/majors
+++ b/sys/conf/majors
@@ -1,4 +1,4 @@
-$Id: majors.i386,v 1.81 1999/08/04 19:55:37 jkh Exp $
+$FreeBSD$
 
 Hopefully, this list will one day be obsoleted by DEVFS, but for now
 this is the current allocation of device major numbers.
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 0bde014374757..4c9db90cab19e 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)newvers.sh	8.1 (Berkeley) 4/20/94
-#	$Id: newvers.sh,v 1.42 1999/01/21 03:07:33 jkh Exp $
+# $FreeBSD$
 
 TYPE="FreeBSD"
 REVISION="4.0"
diff --git a/sys/conf/nfsswapkernel.c b/sys/conf/nfsswapkernel.c
index 12722fff64574..8f8a67e2f1300 100644
--- a/sys/conf/nfsswapkernel.c
+++ b/sys/conf/nfsswapkernel.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * from: @(#)nfsswapvmunix.c	8.1 (Berkeley) 6/10/93
- * $Id: nfsswapkernel.c,v 1.4 1997/09/07 12:56:37 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/conf/options b/sys/conf/options
index f54689afd6b8b..ba04359ad8f84 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-#	$Id: options,v 1.146 1999/08/16 22:39:53 gibbs Exp $
+# $FreeBSD$
 #
 #        On the handling of kernel options   
 # 
diff --git a/sys/conf/options.alpha b/sys/conf/options.alpha
index d78c2205e96e1..fdc5b7d75249a 100644
--- a/sys/conf/options.alpha
+++ b/sys/conf/options.alpha
@@ -1,4 +1,4 @@
-#	$Id: options.alpha,v 1.11 1999/05/27 22:03:31 gallatin Exp $
+# $FreeBSD$
 
 EV5			opt_global.h
 EV4			opt_global.h
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index bd3ac0e5ddbe2..f0adfd96ab8fa 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.119 1999/08/06 14:01:55 hm Exp $
+# $FreeBSD$
 
 DISABLE_PSE
 IDE_DELAY
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index 3c46c2decce37..9906c9b413ebf 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -1,4 +1,4 @@
-#	$Id: options.pc98,v 1.92 1999/08/08 11:13:47 kato Exp $
+# $FreeBSD$
 
 DISABLE_PSE
 IDE_DELAY
diff --git a/sys/conf/param.c b/sys/conf/param.c
index b9a906281f182..9a0a85f08a0ab 100644
--- a/sys/conf/param.c
+++ b/sys/conf/param.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.c	8.3 (Berkeley) 8/20/94
- * $Id: param.c,v 1.33 1999/04/09 16:28:11 des Exp $
+ * $FreeBSD$
  */
 
 #include <stddef.h>
diff --git a/sys/conf/systags.sh b/sys/conf/systags.sh
index 179df30d73f7d..a8e0e4df49459 100644
--- a/sys/conf/systags.sh
+++ b/sys/conf/systags.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)systags.sh	8.1 (Berkeley) 6/10/93
-#	$Id$
+# $FreeBSD$
 #
 # systags.sh - construct a system tags file using dependence relations
 #	in a .depend file
diff --git a/sys/ddb/db_access.c b/sys/ddb/db_access.c
index 511f978280c7c..04de1083bb92c 100644
--- a/sys/ddb/db_access.c
+++ b/sys/ddb/db_access.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_access.c,v 1.13 1997/02/22 09:28:18 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_access.h b/sys/ddb/db_access.h
index ca1b7f9e43cf7..715c1cb002c3c 100644
--- a/sys/ddb/db_access.h
+++ b/sys/ddb/db_access.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _DDB_DB_ACCESS_H_
diff --git a/sys/ddb/db_aout.c b/sys/ddb/db_aout.c
index 3daba33b72148..21d13be68b71a 100644
--- a/sys/ddb/db_aout.c
+++ b/sys/ddb/db_aout.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_aout.c,v 1.25 1999/02/12 12:15:07 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c
index e2abb6585516c..9ac0001255f86 100644
--- a/sys/ddb/db_break.c
+++ b/sys/ddb/db_break.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_break.c,v 1.16 1998/06/08 02:11:19 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_break.h b/sys/ddb/db_break.h
index 003ff8aec8b15..008acab85b1e6 100644
--- a/sys/ddb/db_break.h
+++ b/sys/ddb/db_break.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_break.h,v 1.10 1998/06/07 17:09:36 dfr Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c
index 53c79c6380088..201d1f1bbb09a 100644
--- a/sys/ddb/db_command.c
+++ b/sys/ddb/db_command.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_command.c,v 1.32 1999/07/01 19:42:55 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_command.h b/sys/ddb/db_command.h
index 89e3bc4a58386..a95f5b3aaee31 100644
--- a/sys/ddb/db_command.h
+++ b/sys/ddb/db_command.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _DDB_DB_COMMAND_H_
diff --git a/sys/ddb/db_elf.c b/sys/ddb/db_elf.c
index 1eb9fa5095e86..b4fd53dd118d1 100644
--- a/sys/ddb/db_elf.c
+++ b/sys/ddb/db_elf.c
@@ -1,4 +1,4 @@
-/* $Id: db_elf.c,v 1.5 1999/01/27 19:00:49 dillon Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: db_elf.c,v 1.4 1998/05/03 18:49:54 thorpej Exp $	*/
 
 /*-
diff --git a/sys/ddb/db_examine.c b/sys/ddb/db_examine.c
index 190c107e40dba..87143e11a835b 100644
--- a/sys/ddb/db_examine.c
+++ b/sys/ddb/db_examine.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_examine.c,v 1.25 1999/05/13 06:07:43 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_expr.c b/sys/ddb/db_expr.c
index 0603d9d918576..61f7fc13b94c3 100644
--- a/sys/ddb/db_expr.c
+++ b/sys/ddb/db_expr.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_expr.c,v 1.11 1997/02/22 09:28:23 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c
index b17bdff88356d..b8f407f7c99d7 100644
--- a/sys/ddb/db_input.c
+++ b/sys/ddb/db_input.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_input.c,v 1.24 1999/07/14 10:53:41 yokota Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_kld.c b/sys/ddb/db_kld.c
index 09246c79b3bb9..8bb1b6b6ed726 100644
--- a/sys/ddb/db_kld.c
+++ b/sys/ddb/db_kld.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_kld.c,v 1.5 1999/01/27 19:00:49 dillon Exp $
+ * $FreeBSD$
  *	from db_aout.c,v 1.20 1998/06/07 17:09:36 dfr Exp
  */
 
diff --git a/sys/ddb/db_lex.c b/sys/ddb/db_lex.c
index e66d43d640884..392b8b07cb303 100644
--- a/sys/ddb/db_lex.c
+++ b/sys/ddb/db_lex.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_lex.c,v 1.16 1998/06/27 15:40:56 dfr Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_lex.h b/sys/ddb/db_lex.h
index 726eaa4310f9b..c4e0ee2a6ba4c 100644
--- a/sys/ddb/db_lex.h
+++ b/sys/ddb/db_lex.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_lex.h,v 1.10 1998/06/27 15:40:56 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _DDB_DB_LEX_H_
diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c
index 33183229964cc..9192c183c6ae2 100644
--- a/sys/ddb/db_output.c
+++ b/sys/ddb/db_output.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_output.c,v 1.24 1998/07/08 09:11:36 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_output.h b/sys/ddb/db_output.h
index 73305d5e31d19..8172bbba6d836 100644
--- a/sys/ddb/db_output.h
+++ b/sys/ddb/db_output.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _DDB_DB_OUTPUT_H_
diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c
index a02f9922de367..06e9f43da6598 100644
--- a/sys/ddb/db_print.c
+++ b/sys/ddb/db_print.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_print.c,v 1.24 1999/01/27 23:45:37 dillon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_ps.c b/sys/ddb/db_ps.c
index 806032210783b..f005fd8324731 100644
--- a/sys/ddb/db_ps.c
+++ b/sys/ddb/db_ps.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: db_ps.c,v 1.18 1999/05/13 13:01:46 bde Exp $
+ * $FreeBSD$
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c
index 3d16d130c7833..be780e3782493 100644
--- a/sys/ddb/db_run.c
+++ b/sys/ddb/db_run.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_run.c,v 1.16 1998/07/05 10:12:18 dfr Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c
index 293f3ec954a33..7cba6883426bc 100644
--- a/sys/ddb/db_sym.c
+++ b/sys/ddb/db_sym.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_sym.c,v 1.30 1999/02/12 12:44:19 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_sym.h b/sys/ddb/db_sym.h
index 51d579bdeac80..e4decf4037016 100644
--- a/sys/ddb/db_sym.h
+++ b/sys/ddb/db_sym.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_sym.h,v 1.17 1999/01/27 23:45:37 dillon Exp $
+ * $FreeBSD$
  */
 
 #ifndef _DDB_DB_SYM_H_
diff --git a/sys/ddb/db_trap.c b/sys/ddb/db_trap.c
index f4da0f8eaff16..2111957ec4569 100644
--- a/sys/ddb/db_trap.c
+++ b/sys/ddb/db_trap.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_trap.c,v 1.12 1997/03/28 12:39:43 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_variables.c b/sys/ddb/db_variables.c
index dff4093b69305..8c0eb98fe743e 100644
--- a/sys/ddb/db_variables.c
+++ b/sys/ddb/db_variables.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_variables.c,v 1.16 1998/07/08 09:11:39 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_variables.h b/sys/ddb/db_variables.h
index 20d33388712d8..f430f0d8c94d0 100644
--- a/sys/ddb/db_variables.h
+++ b/sys/ddb/db_variables.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_variables.h,v 1.9 1998/06/07 17:09:38 dfr Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c
index f85362035f4ec..6ba85c03995b7 100644
--- a/sys/ddb/db_watch.c
+++ b/sys/ddb/db_watch.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_watch.c,v 1.17 1998/07/08 06:43:57 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_watch.h b/sys/ddb/db_watch.h
index 58f4f6a2792c0..18943f43942dc 100644
--- a/sys/ddb/db_watch.h
+++ b/sys/ddb/db_watch.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/db_write_cmd.c b/sys/ddb/db_write_cmd.c
index d745100d924a7..3da61d35dd9d2 100644
--- a/sys/ddb/db_write_cmd.c
+++ b/sys/ddb/db_write_cmd.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_write_cmd.c,v 1.11 1998/07/08 10:53:52 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/ddb/ddb.h b/sys/ddb/ddb.h
index 38bf3cb8a142e..46fb2b5e25059 100644
--- a/sys/ddb/ddb.h
+++ b/sys/ddb/ddb.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ddb.h,v 1.21 1999/01/27 19:00:49 dillon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/advansys/adv_eisa.c b/sys/dev/advansys/adv_eisa.c
index 4b475d3d11938..ad9604e69626c 100644
--- a/sys/dev/advansys/adv_eisa.c
+++ b/sys/dev/advansys/adv_eisa.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: adv_eisa.c,v 1.5 1999/08/01 22:57:08 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include "eisa.h"
diff --git a/sys/dev/advansys/adv_isa.c b/sys/dev/advansys/adv_isa.c
index 5cc06c5801b2c..7390939cb9c59 100644
--- a/sys/dev/advansys/adv_isa.c
+++ b/sys/dev/advansys/adv_isa.c
@@ -44,7 +44,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: adv_isa.c,v 1.11 1999/05/08 18:20:57 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/advansys/adv_pci.c b/sys/dev/advansys/adv_pci.c
index 1ca2cee1e5978..8f8fc58f374b1 100644
--- a/sys/dev/advansys/adv_pci.c
+++ b/sys/dev/advansys/adv_pci.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: adv_pci.c,v 1.7 1999/07/03 20:16:58 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/advansys/advansys.c b/sys/dev/advansys/advansys.c
index c05604cedb6ea..19cb21ad6fb54 100644
--- a/sys/dev/advansys/advansys.c
+++ b/sys/dev/advansys/advansys.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: advansys.c,v 1.10 1999/05/06 20:16:09 ken Exp $
+ * $FreeBSD$
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/advansys.h b/sys/dev/advansys/advansys.h
index 51519238d582a..9108e2d2ff860 100644
--- a/sys/dev/advansys/advansys.h
+++ b/sys/dev/advansys/advansys.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  * All rights reserved.
  *
- *      $Id: advansys.h,v 1.3 1997/02/22 09:38:38 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _ADVANSYS_H_
diff --git a/sys/dev/advansys/advlib.c b/sys/dev/advansys/advlib.c
index 568bf9112f0b5..ad5469f319784 100644
--- a/sys/dev/advansys/advlib.c
+++ b/sys/dev/advansys/advlib.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: advlib.c,v 1.12 1999/04/19 21:27:36 gibbs Exp $
+ * $FreeBSD$
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/advlib.h b/sys/dev/advansys/advlib.h
index b7684cca594d8..7f59a852413c2 100644
--- a/sys/dev/advansys/advlib.h
+++ b/sys/dev/advansys/advlib.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: advlib.h,v 1.4 1998/09/15 07:03:33 gibbs Exp $
+ * $FreeBSD$
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/advmcode.c b/sys/dev/advansys/advmcode.c
index d49eb328a0357..22491297f6cb3 100644
--- a/sys/dev/advansys/advmcode.c
+++ b/sys/dev/advansys/advmcode.c
@@ -1,7 +1,7 @@
 /*
  * Downloadable microcode for Advanced Systems Inc. SCSI controllers
  *
- *	$Id: advmcode.c,v 1.4 1998/09/15 07:03:33 gibbs Exp $
+ * $FreeBSD$
  *
  * Obtained from:
  * advansys.c - Linux Host Driver for AdvanSys SCSI Adapters
diff --git a/sys/dev/advansys/advmcode.h b/sys/dev/advansys/advmcode.h
index c3794693e6ada..666bb774e0eb0 100644
--- a/sys/dev/advansys/advmcode.h
+++ b/sys/dev/advansys/advmcode.h
@@ -1,7 +1,7 @@
 /*
  * Exported interface to downloadable microcode for AdvanSys SCSI Adapters
  *
- *	$Id: advmcode.h,v 1.3 1997/02/22 09:28:48 peter Exp $
+ * $FreeBSD$
  *
  * Obtained from:
  *
diff --git a/sys/dev/advansys/adw_pci.c b/sys/dev/advansys/adw_pci.c
index 6509786305456..10eda815814ac 100644
--- a/sys/dev/advansys/adw_pci.c
+++ b/sys/dev/advansys/adw_pci.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: adw_pci.c,v 1.6 1999/07/03 20:16:58 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/advansys/adwcam.c b/sys/dev/advansys/adwcam.c
index 0b6bc7e1a8975..b30f16c8e933b 100644
--- a/sys/dev/advansys/adwcam.c
+++ b/sys/dev/advansys/adwcam.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: adwcam.c,v 1.3 1999/05/06 20:16:12 ken Exp $
+ * $FreeBSD$
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/adwlib.c b/sys/dev/advansys/adwlib.c
index c727ca633b751..289c3c67b1eec 100644
--- a/sys/dev/advansys/adwlib.c
+++ b/sys/dev/advansys/adwlib.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: adwlib.c,v 1.1 1998/10/07 03:20:46 gibbs Exp $
+ * $FreeBSD$
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/adwlib.h b/sys/dev/advansys/adwlib.h
index 5b9e5535b86f1..3773cf14eaa20 100644
--- a/sys/dev/advansys/adwlib.h
+++ b/sys/dev/advansys/adwlib.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id$
+ * $FreeBSD$
  */
 /*
  * Ported from:
diff --git a/sys/dev/advansys/adwmcode.c b/sys/dev/advansys/adwmcode.c
index 61c856bf6d53b..84f77e541d144 100644
--- a/sys/dev/advansys/adwmcode.c
+++ b/sys/dev/advansys/adwmcode.c
@@ -2,7 +2,7 @@
  * Downloadable microcode for Second Generation
  * Advanced Systems Inc. SCSI controllers
  *
- *	$Id$
+ * $FreeBSD$
  *
  * Obtained from:
  * advansys.c - Linux Host Driver for AdvanSys SCSI Adapters
diff --git a/sys/dev/advansys/adwmcode.h b/sys/dev/advansys/adwmcode.h
index 41abbf8a9caf2..99d2d6fa8c5cc 100644
--- a/sys/dev/advansys/adwmcode.h
+++ b/sys/dev/advansys/adwmcode.h
@@ -1,7 +1,7 @@
 /*
  * Exported interface to downloadable microcode for AdvanSys SCSI Adapters
  *
- *	$Id: advmcode.h,v 1.4 1998/09/15 07:03:34 gibbs Exp $
+ * $FreeBSD$
  *
  * Obtained from:
  *
diff --git a/sys/dev/advansys/adwvar.h b/sys/dev/advansys/adwvar.h
index c679123de1852..1820b8a68adee 100644
--- a/sys/dev/advansys/adwvar.h
+++ b/sys/dev/advansys/adwvar.h
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  * All rights reserved.
  *
- *      $Id$
+ * $FreeBSD$
  */
 
 #ifndef _ADWVAR_H_
diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c
index fe9d7b987876e..50cec6fba0dc7 100644
--- a/sys/dev/aha/aha.c
+++ b/sys/dev/aha/aha.c
@@ -55,7 +55,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aha.c,v 1.26 1999/05/25 20:15:19 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include "pnp.h"
diff --git a/sys/dev/aha/aha_isa.c b/sys/dev/aha/aha_isa.c
index b6e0cb08e523e..6484eacb225cf 100644
--- a/sys/dev/aha/aha_isa.c
+++ b/sys/dev/aha/aha_isa.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: aha_isa.c,v 1.8 1999/05/08 18:20:55 peter Exp $
+ * $FreeBSD$
  */
 
 #include "pnp.h"
diff --git a/sys/dev/aha/ahareg.h b/sys/dev/aha/ahareg.h
index ba3a1c3ddac32..0e2ce77c9cf32 100644
--- a/sys/dev/aha/ahareg.h
+++ b/sys/dev/aha/ahareg.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: ahareg.h,v 1.5 1999/01/20 06:21:27 imp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _AHAREG_H_
diff --git a/sys/dev/ahb/ahb.c b/sys/dev/ahb/ahb.c
index a1dc84ac5e7ad..67eead4dd7e21 100644
--- a/sys/dev/ahb/ahb.c
+++ b/sys/dev/ahb/ahb.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ahb.c,v 1.13 1999/08/01 22:57:08 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include "eisa.h"
diff --git a/sys/dev/ahb/ahbreg.h b/sys/dev/ahb/ahbreg.h
index 1bed89ebff4a5..c72f068aa3b9d 100644
--- a/sys/dev/ahb/ahbreg.h
+++ b/sys/dev/ahb/ahbreg.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /* Resource Constatns */
diff --git a/sys/dev/aic7xxx/93cx6.c b/sys/dev/aic7xxx/93cx6.c
index 19d64a9f330cf..49d7952c44970 100644
--- a/sys/dev/aic7xxx/93cx6.c
+++ b/sys/dev/aic7xxx/93cx6.c
@@ -18,7 +18,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *      $Id: 93cx6.c,v 1.2 1999/04/07 23:02:45 gibbs Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/aic7xxx/93cx6.h b/sys/dev/aic7xxx/93cx6.h
index 32645e1096ef9..b1694834a06bd 100644
--- a/sys/dev/aic7xxx/93cx6.h
+++ b/sys/dev/aic7xxx/93cx6.h
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/aic7xxx/Makefile b/sys/dev/aic7xxx/Makefile
index b47dab3520815..aa478151de4e1 100644
--- a/sys/dev/aic7xxx/Makefile
+++ b/sys/dev/aic7xxx/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1997/09/27 19:37:22 gibbs Exp $
+# $FreeBSD$
 
 PROG=	aicasm
 
diff --git a/sys/dev/aic7xxx/ahc_eisa.c b/sys/dev/aic7xxx/ahc_eisa.c
index 39450187d3a6f..e98be7d3a3d5d 100644
--- a/sys/dev/aic7xxx/ahc_eisa.c
+++ b/sys/dev/aic7xxx/ahc_eisa.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ahc_eisa.c,v 1.11 1999/08/01 22:57:08 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include "eisa.h"
diff --git a/sys/dev/aic7xxx/ahc_pci.c b/sys/dev/aic7xxx/ahc_pci.c
index 54f429f9bab59..64fcbd53c8f6e 100644
--- a/sys/dev/aic7xxx/ahc_pci.c
+++ b/sys/dev/aic7xxx/ahc_pci.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ahc_pci.c,v 1.17 1999/08/16 02:33:46 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c
index 9a1cd69a146cd..af30729e86ddf 100644
--- a/sys/dev/aic7xxx/aic7xxx.c
+++ b/sys/dev/aic7xxx/aic7xxx.c
@@ -36,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aic7xxx.c,v 1.33 1999/08/21 06:23:59 msmith Exp $
+ * $FreeBSD$
  */
 /*
  * A few notes on features of the driver.
diff --git a/sys/dev/aic7xxx/aic7xxx.h b/sys/dev/aic7xxx/aic7xxx.h
index a4a1cf5ac2981..fca4aeaf965fe 100644
--- a/sys/dev/aic7xxx/aic7xxx.h
+++ b/sys/dev/aic7xxx/aic7xxx.h
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: aic7xxx.h,v 1.10 1999/05/22 22:04:10 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef _AIC7XXX_H_
diff --git a/sys/dev/aic7xxx/aic7xxx.reg b/sys/dev/aic7xxx/aic7xxx.reg
index 848c04ae7d4ff..341b56c752e00 100644
--- a/sys/dev/aic7xxx/aic7xxx.reg
+++ b/sys/dev/aic7xxx/aic7xxx.reg
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: aic7xxx.reg,v 1.15 1999/05/14 05:07:24 gibbs Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/aic7xxx/aic7xxx.seq b/sys/dev/aic7xxx/aic7xxx.seq
index bc333f4d8262e..f8c5381fe7ecf 100644
--- a/sys/dev/aic7xxx/aic7xxx.seq
+++ b/sys/dev/aic7xxx/aic7xxx.seq
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: aic7xxx.seq,v 1.88 1999/05/14 05:07:25 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include <dev/aic7xxx/aic7xxx.reg>
diff --git a/sys/dev/aic7xxx/aic7xxx_93cx6.c b/sys/dev/aic7xxx/aic7xxx_93cx6.c
index 19d64a9f330cf..49d7952c44970 100644
--- a/sys/dev/aic7xxx/aic7xxx_93cx6.c
+++ b/sys/dev/aic7xxx/aic7xxx_93cx6.c
@@ -18,7 +18,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *      $Id: 93cx6.c,v 1.2 1999/04/07 23:02:45 gibbs Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/aic7xxx/aic7xxx_93cx6.h b/sys/dev/aic7xxx/aic7xxx_93cx6.h
index 32645e1096ef9..b1694834a06bd 100644
--- a/sys/dev/aic7xxx/aic7xxx_93cx6.h
+++ b/sys/dev/aic7xxx/aic7xxx_93cx6.h
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/aic7xxx/aicasm.c b/sys/dev/aic7xxx/aicasm.c
index f6a1a191e3166..9af5c83432741 100644
--- a/sys/dev/aic7xxx/aicasm.c
+++ b/sys/dev/aic7xxx/aicasm.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aicasm.c,v 1.21 1999/03/23 07:24:29 gibbs Exp $
+ * $FreeBSD$
  */
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/sys/dev/aic7xxx/aicasm.h b/sys/dev/aic7xxx/aicasm.h
index 50806757c166b..02ee4647e1e3b 100644
--- a/sys/dev/aic7xxx/aicasm.h
+++ b/sys/dev/aic7xxx/aicasm.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aicasm.h,v 1.3 1997/06/27 19:38:47 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/sys/dev/aic7xxx/aicasm/Makefile b/sys/dev/aic7xxx/aicasm/Makefile
index b47dab3520815..aa478151de4e1 100644
--- a/sys/dev/aic7xxx/aicasm/Makefile
+++ b/sys/dev/aic7xxx/aicasm/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1997/09/27 19:37:22 gibbs Exp $
+# $FreeBSD$
 
 PROG=	aicasm
 
diff --git a/sys/dev/aic7xxx/aicasm/aicasm.c b/sys/dev/aic7xxx/aicasm/aicasm.c
index f6a1a191e3166..9af5c83432741 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm.c
+++ b/sys/dev/aic7xxx/aicasm/aicasm.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aicasm.c,v 1.21 1999/03/23 07:24:29 gibbs Exp $
+ * $FreeBSD$
  */
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm.h b/sys/dev/aic7xxx/aicasm/aicasm.h
index 50806757c166b..02ee4647e1e3b 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm.h
+++ b/sys/dev/aic7xxx/aicasm/aicasm.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aicasm.h,v 1.3 1997/06/27 19:38:47 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_gram.y b/sys/dev/aic7xxx/aicasm/aicasm_gram.y
index fdf352249ab8f..105da24de57de 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_gram.y
+++ b/sys/dev/aic7xxx/aicasm/aicasm_gram.y
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aicasm_gram.y,v 1.5 1998/09/15 07:24:17 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_scan.l b/sys/dev/aic7xxx/aicasm/aicasm_scan.l
index 44bc8345d479f..e5f497942b40f 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_scan.l
+++ b/sys/dev/aic7xxx/aicasm/aicasm_scan.l
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aicasm_scan.l,v 1.5 1997/09/27 19:37:29 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_symbol.c b/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
index 0704baa0942e5..5b05d6d4e138d 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
+++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aicasm_symbol.c,v 1.5 1998/09/15 07:24:17 gibbs Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_symbol.h b/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
index ba98b435edafc..ac8f9b8ab1629 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
+++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aicasm_symbol.h,v 1.3 1997/09/27 19:37:30 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/sys/dev/aic7xxx/aicasm_gram.y b/sys/dev/aic7xxx/aicasm_gram.y
index fdf352249ab8f..105da24de57de 100644
--- a/sys/dev/aic7xxx/aicasm_gram.y
+++ b/sys/dev/aic7xxx/aicasm_gram.y
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aicasm_gram.y,v 1.5 1998/09/15 07:24:17 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/sys/dev/aic7xxx/aicasm_scan.l b/sys/dev/aic7xxx/aicasm_scan.l
index 44bc8345d479f..e5f497942b40f 100644
--- a/sys/dev/aic7xxx/aicasm_scan.l
+++ b/sys/dev/aic7xxx/aicasm_scan.l
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aicasm_scan.l,v 1.5 1997/09/27 19:37:29 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/dev/aic7xxx/aicasm_symbol.c b/sys/dev/aic7xxx/aicasm_symbol.c
index 0704baa0942e5..5b05d6d4e138d 100644
--- a/sys/dev/aic7xxx/aicasm_symbol.c
+++ b/sys/dev/aic7xxx/aicasm_symbol.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aicasm_symbol.c,v 1.5 1998/09/15 07:24:17 gibbs Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/dev/aic7xxx/aicasm_symbol.h b/sys/dev/aic7xxx/aicasm_symbol.h
index ba98b435edafc..ac8f9b8ab1629 100644
--- a/sys/dev/aic7xxx/aicasm_symbol.h
+++ b/sys/dev/aic7xxx/aicasm_symbol.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: aicasm_symbol.h,v 1.3 1997/09/27 19:37:30 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/sys/dev/aic7xxx/sequencer.h b/sys/dev/aic7xxx/sequencer.h
index 0fe929ba29868..c84b39b4c04b6 100644
--- a/sys/dev/aic7xxx/sequencer.h
+++ b/sys/dev/aic7xxx/sequencer.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: sequencer.h,v 1.3 1997/09/27 19:37:31 gibbs Exp $
+ * $FreeBSD$
  */
 
 struct ins_format1 {
diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index 66771534bbf03..342cba4959526 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.26 1999/05/06 18:58:04 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index 66771534bbf03..342cba4959526 100644
--- a/sys/dev/ar/if_ar_isa.c
+++ b/sys/dev/ar/if_ar_isa.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.26 1999/05/06 18:58:04 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ar/if_arregs.h b/sys/dev/ar/if_arregs.h
index 974b761279629..6c5b020908e20 100644
--- a/sys/dev/ar/if_arregs.h
+++ b/sys/dev/ar/if_arregs.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifndef _IF_ARREGS_H_
 #define _IF_ARREGS_H_
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index bc4e199faabb6..d0ef616318a5c 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: ata-all.c,v 1.15 1999/06/25 09:02:56 sos Exp $
+ * $FreeBSD$
  */
 
 #include "ata.h"
diff --git a/sys/dev/ata/ata-all.h b/sys/dev/ata/ata-all.h
index 5bcbed0e485e5..183ae7263448f 100644
--- a/sys/dev/ata/ata-all.h
+++ b/sys/dev/ata/ata-all.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ata-all.h,v 1.7 1999/06/25 09:02:57 sos Exp $
+ * $FreeBSD$
  */
 
 /* ATA register defines */
diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c
index 8546501279198..d8196a4833b05 100644
--- a/sys/dev/ata/ata-disk.c
+++ b/sys/dev/ata/ata-disk.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ata-disk.c,v 1.17 1999/08/14 11:40:33 phk Exp $
+ * $FreeBSD$
  */
 
 #include "ata.h"
diff --git a/sys/dev/ata/ata-disk.h b/sys/dev/ata/ata-disk.h
index db4147bd1c83b..70af5ce632ee5 100644
--- a/sys/dev/ata/ata-disk.h
+++ b/sys/dev/ata/ata-disk.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ata-disk.h,v 1.7 1999/06/25 09:03:00 sos Exp $
+ * $FreeBSD$
  */
 
 /* ATA device parameter information */
diff --git a/sys/dev/ata/ata-dma.c b/sys/dev/ata/ata-dma.c
index 8e0ab97480fb8..04157008cf0f2 100644
--- a/sys/dev/ata/ata-dma.c
+++ b/sys/dev/ata/ata-dma.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ata-dma.c,v 1.9 1999/08/06 17:39:38 sos Exp $
+ * $FreeBSD$
  */
 
 #include "ata.h"
diff --git a/sys/dev/ata/atapi-all.c b/sys/dev/ata/atapi-all.c
index ff13d462fcb97..45f7087644eba 100644
--- a/sys/dev/ata/atapi-all.c
+++ b/sys/dev/ata/atapi-all.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-all.c,v 1.11 1999/08/10 21:59:58 sos Exp $
+ * $FreeBSD$
  */
 
 #include "ata.h"
diff --git a/sys/dev/ata/atapi-all.h b/sys/dev/ata/atapi-all.h
index 82f51a84e3809..f259b87a536c3 100644
--- a/sys/dev/ata/atapi-all.h
+++ b/sys/dev/ata/atapi-all.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-all.h,v 1.6 1999/05/20 09:12:04 sos Exp $
+ * $FreeBSD$
  */
 
 /* ATAPI misc defines */
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c
index 439c4d69e75db..bd804b4979a13 100644
--- a/sys/dev/ata/atapi-cd.c
+++ b/sys/dev/ata/atapi-cd.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-cd.c,v 1.11 1999/06/25 09:03:04 sos Exp $
+ * $FreeBSD$
  */
 
 #include "ata.h"
diff --git a/sys/dev/ata/atapi-cd.h b/sys/dev/ata/atapi-cd.h
index 95a0af6323cda..6afa00d10ac8b 100644
--- a/sys/dev/ata/atapi-cd.h
+++ b/sys/dev/ata/atapi-cd.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-cd.h,v 1.2 1999/03/03 21:10:29 sos Exp $
+ * $FreeBSD$
  */
 
 /* CDROM Table Of Contents */
diff --git a/sys/dev/ata/atapi-fd.c b/sys/dev/ata/atapi-fd.c
index f8c386598a1d2..5a2fd18f01855 100644
--- a/sys/dev/ata/atapi-fd.c
+++ b/sys/dev/ata/atapi-fd.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-fd.c,v 1.12 1999/08/14 11:40:33 phk Exp $
+ * $FreeBSD$
  */
 
 #include "ata.h"
diff --git a/sys/dev/ata/atapi-fd.h b/sys/dev/ata/atapi-fd.h
index 59babb0d00353..02b60eb610912 100644
--- a/sys/dev/ata/atapi-fd.h
+++ b/sys/dev/ata/atapi-fd.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-fd.h,v 1.2 1999/05/20 09:12:06 sos Exp $
+ * $FreeBSD$
  */
 
 /* MODE SENSE parameter header */ 
diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c
index 8dc2044d6607d..ce3d6ff347f1b 100644
--- a/sys/dev/ata/atapi-tape.c
+++ b/sys/dev/ata/atapi-tape.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-tape.c,v 1.11 1999/06/25 09:03:06 sos Exp $
+ * $FreeBSD$
  */
 
 #include "ata.h"
diff --git a/sys/dev/ata/atapi-tape.h b/sys/dev/ata/atapi-tape.h
index 9c61225973571..209f79dec0707 100644
--- a/sys/dev/ata/atapi-tape.h
+++ b/sys/dev/ata/atapi-tape.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-tape.h,v 1.4 1999/06/25 09:03:07 sos Exp $
+ * $FreeBSD$
  */
 
 /* MODE SENSE parameter header */
diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c
index 3786ee9a0b988..3094c60140df2 100644
--- a/sys/dev/atkbdc/atkbd.c
+++ b/sys/dev/atkbdc/atkbd.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: atkbd.c,v 1.14 1999/08/22 09:52:32 yokota Exp $
+ * $FreeBSD$
  */
 
 #include "atkbd.h"
diff --git a/sys/dev/atkbdc/atkbd_atkbdc.c b/sys/dev/atkbdc/atkbd_atkbdc.c
index a8d638121b1d1..f686170ec9497 100644
--- a/sys/dev/atkbdc/atkbd_atkbdc.c
+++ b/sys/dev/atkbdc/atkbd_atkbdc.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: atkbd_isa.c,v 1.4 1999/05/08 21:59:28 dfr Exp $
+ * $FreeBSD$
  */
 
 #include "atkbd.h"
diff --git a/sys/dev/atkbdc/atkbd_isa.c b/sys/dev/atkbdc/atkbd_isa.c
index a8d638121b1d1..f686170ec9497 100644
--- a/sys/dev/atkbdc/atkbd_isa.c
+++ b/sys/dev/atkbdc/atkbd_isa.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: atkbd_isa.c,v 1.4 1999/05/08 21:59:28 dfr Exp $
+ * $FreeBSD$
  */
 
 #include "atkbd.h"
diff --git a/sys/dev/atkbdc/atkbdc.c b/sys/dev/atkbdc/atkbdc.c
index ded635795b0d2..68fcffc293342 100644
--- a/sys/dev/atkbdc/atkbdc.c
+++ b/sys/dev/atkbdc/atkbdc.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: atkbdc.c,v 1.2 1999/05/18 11:33:04 yokota Exp $
+ * $FreeBSD$
  * from kbdio.c,v 1.13 1998/09/25 11:55:46 yokota Exp
  */
 
diff --git a/sys/dev/atkbdc/atkbdc_isa.c b/sys/dev/atkbdc/atkbdc_isa.c
index 387f9a534153b..eae6e14fec840 100644
--- a/sys/dev/atkbdc/atkbdc_isa.c
+++ b/sys/dev/atkbdc/atkbdc_isa.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: atkbdc_isa.c,v 1.9 1999/06/29 17:35:09 yokota Exp $
+ * $FreeBSD$
  */
 
 #include "atkbdc.h"
diff --git a/sys/dev/atkbdc/atkbdc_subr.c b/sys/dev/atkbdc/atkbdc_subr.c
index 387f9a534153b..eae6e14fec840 100644
--- a/sys/dev/atkbdc/atkbdc_subr.c
+++ b/sys/dev/atkbdc/atkbdc_subr.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: atkbdc_isa.c,v 1.9 1999/06/29 17:35:09 yokota Exp $
+ * $FreeBSD$
  */
 
 #include "atkbdc.h"
diff --git a/sys/dev/atkbdc/atkbdcreg.h b/sys/dev/atkbdc/atkbdcreg.h
index ccf64e4032c7c..2085bb67bb92a 100644
--- a/sys/dev/atkbdc/atkbdcreg.h
+++ b/sys/dev/atkbdc/atkbdcreg.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: atkbdcreg.h,v 1.1 1999/01/09 02:44:50 yokota Exp $
+ * $FreeBSD$
  * from kbdio.h,v 1.8 1998/09/25 11:55:46 yokota Exp
  */
 
diff --git a/sys/dev/atkbdc/atkbdreg.h b/sys/dev/atkbdc/atkbdreg.h
index 04401520b759e..bda6afb8582df 100644
--- a/sys/dev/atkbdc/atkbdreg.h
+++ b/sys/dev/atkbdc/atkbdreg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: atkbdreg.h,v 1.2 1999/03/10 10:36:52 yokota Exp $
+ * $FreeBSD$
  */
 
 #ifndef _DEV_KBD_ATKBDREG_H_
diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c
index e7c82c97dd477..6e861ccdba9c4 100644
--- a/sys/dev/atkbdc/psm.c
+++ b/sys/dev/atkbdc/psm.c
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: psm.c,v 1.16 1999/08/22 06:11:52 yokota Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 27b73d013a7d9..46cf72e121e6c 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -1,4 +1,4 @@
-/* $Id: brooktree848.c,v 1.89 1999/07/12 15:51:48 roger Exp $ */
+/* $FreeBSD$ */
 /* BT848 Driver for Brooktree's Bt848, Bt848A, Bt849A, Bt878, Bt879 based cards.
    The Brooktree  BT848 Driver driver is based upon Mark Tinguely and
    Jim Lowe's driver for the Matrox Meteor PCI card . The 
diff --git a/sys/dev/bktr/bktr_i2c.c b/sys/dev/bktr/bktr_i2c.c
index a3a1fdd737da3..5e4ecc9a8f292 100644
--- a/sys/dev/bktr/bktr_i2c.c
+++ b/sys/dev/bktr/bktr_i2c.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bt848_i2c.c,v 1.5 1999/07/03 20:17:01 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/bktr/bktr_i2c.h b/sys/dev/bktr/bktr_i2c.h
index c7d22c50484e7..075e9885ae5d2 100644
--- a/sys/dev/bktr/bktr_i2c.h
+++ b/sys/dev/bktr/bktr_i2c.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  *
  */
 #ifndef _BT848_I2C_H
diff --git a/sys/dev/bktr/bktr_reg.h b/sys/dev/bktr/bktr_reg.h
index ab34cec12cd65..643d3f353f58b 100644
--- a/sys/dev/bktr/bktr_reg.h
+++ b/sys/dev/bktr/bktr_reg.h
@@ -30,7 +30,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: brktree_reg.h,v 1.29 1999/06/12 14:54:56 roger Exp $
+ * $FreeBSD$
  */
 #ifndef PCI_LATENCY_TIMER
 #define	PCI_LATENCY_TIMER		0x0c	/* pci timer register */
diff --git a/sys/dev/bktr/ioctl_bt848.h b/sys/dev/bktr/ioctl_bt848.h
index 0767abddb684c..30e18d156da3a 100644
--- a/sys/dev/bktr/ioctl_bt848.h
+++ b/sys/dev/bktr/ioctl_bt848.h
@@ -1,7 +1,7 @@
 /*
  * extensions to ioctl_meteor.h for the bt848 cards
  *
- * $Id: ioctl_bt848.h,v 1.22 1999/02/15 11:04:36 roger Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/buslogic/bt.c b/sys/dev/buslogic/bt.c
index abedc48699157..23a30d39841db 100644
--- a/sys/dev/buslogic/bt.c
+++ b/sys/dev/buslogic/bt.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: bt.c,v 1.22 1999/05/23 18:54:34 gibbs Exp $
+ * $FreeBSD$
  */
 
  /*
diff --git a/sys/dev/buslogic/bt_eisa.c b/sys/dev/buslogic/bt_eisa.c
index d9cb5840438c6..400b42b046f75 100644
--- a/sys/dev/buslogic/bt_eisa.c
+++ b/sys/dev/buslogic/bt_eisa.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bt_eisa.c,v 1.8 1999/08/01 22:57:08 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include "eisa.h"
diff --git a/sys/dev/buslogic/bt_isa.c b/sys/dev/buslogic/bt_isa.c
index 6a45d50a2de5e..b51fe8eb9ed87 100644
--- a/sys/dev/buslogic/bt_isa.c
+++ b/sys/dev/buslogic/bt_isa.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bt_isa.c,v 1.15 1999/06/28 09:19:58 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/buslogic/bt_pci.c b/sys/dev/buslogic/bt_pci.c
index 5aa884444497b..154a2f2febc37 100644
--- a/sys/dev/buslogic/bt_pci.c
+++ b/sys/dev/buslogic/bt_pci.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bt_pci.c,v 1.8 1999/07/03 20:17:01 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/buslogic/btreg.h b/sys/dev/buslogic/btreg.h
index 00660e0ce81ac..23b3228613064 100644
--- a/sys/dev/buslogic/btreg.h
+++ b/sys/dev/buslogic/btreg.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: btreg.h,v 1.7 1999/04/23 23:28:20 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef _BTREG_H_
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index e4faa3f4b8a6f..7badacb7d7c00 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -1,4 +1,4 @@
-/* $Id: ccd.c,v 1.52 1999/08/14 11:40:34 phk Exp $ */
+/* $FreeBSD$ */
 
 /*	$NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $	*/
 
diff --git a/sys/dev/cs/if_cs.c b/sys/dev/cs/if_cs.c
index 4863ffe3c7ff3..aa7e06c788fda 100644
--- a/sys/dev/cs/if_cs.c
+++ b/sys/dev/cs/if_cs.c
@@ -27,7 +27,7 @@
  */
 
 /*
- * $Id: if_cs.c,v 1.10 1999/04/16 21:22:20 peter Exp $
+ * $FreeBSD$
  *
  * Device driver for Crystal Semiconductor CS8920 based ethernet
  *   adapters. By Maxim Bolotin and Oleg Sharoiko, 27-April-1997
diff --git a/sys/dev/cs/if_csreg.h b/sys/dev/cs/if_csreg.h
index 3d53f01db7530..56d9fcd595afc 100644
--- a/sys/dev/cs/if_csreg.h
+++ b/sys/dev/cs/if_csreg.h
@@ -27,7 +27,7 @@
  */
 
 /*
- * $Id: if_csreg.h,v 1.7 1998/07/19 16:13:39 root Exp root $
+ * $FreeBSD$
  */
 
 #define PP_ChipID 0x0000	/* offset   0h -> Corp -ID              */
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 56b0bbc3621f7..4181c44e2b4e9 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.91 1999/06/04 18:13:25 bde Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 56b0bbc3621f7..4181c44e2b4e9 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.91 1999/06/04 18:13:25 bde Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/dev/cy/cy_pci.c b/sys/dev/cy/cy_pci.c
index 61848c3213deb..71e16953af7ad 100644
--- a/sys/dev/cy/cy_pci.c
+++ b/sys/dev/cy/cy_pci.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cy_pci.c,v 1.15 1999/05/10 10:23:38 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/cy/cyreg.h b/sys/dev/cy/cyreg.h
index baedda4175b2f..88a36eb4a65e2 100644
--- a/sys/dev/cy/cyreg.h
+++ b/sys/dev/cy/cyreg.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cyreg.h,v 1.7 1998/08/13 19:03:22 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/dec/mcclock.c b/sys/dev/dec/mcclock.c
index fc06f829e3d96..a8a94be5e3d0f 100644
--- a/sys/dev/dec/mcclock.c
+++ b/sys/dev/dec/mcclock.c
@@ -1,4 +1,4 @@
-/* $Id: mcclock.c,v 1.2 1998/06/14 13:45:41 dfr Exp $ */
+/* $FreeBSD$ */
 /* $NetBSD: mcclock.c,v 1.11 1998/04/19 07:50:25 jonathan Exp $ */
 
 /*
diff --git a/sys/dev/dec/mcclock_if.m b/sys/dev/dec/mcclock_if.m
index 79686237ed57b..01b8a64dc6a2d 100644
--- a/sys/dev/dec/mcclock_if.m
+++ b/sys/dev/dec/mcclock_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id: mcclock_if.m,v 1.1 1998/06/14 13:52:55 dfr Exp $
+# $FreeBSD$
 #
 
 INTERFACE mcclock;
diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index 3e7e14e5f24c4..60008abe5133c 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.50 1999/05/31 11:25:31 phk Exp $
+ *  dgb.c $FreeBSD$
  *
  *  Digiboard driver.
  *
diff --git a/sys/dev/dgb/dgm.c b/sys/dev/dgb/dgm.c
index b289be432d50c..5deb61df96815 100644
--- a/sys/dev/dgb/dgm.c
+++ b/sys/dev/dgb/dgm.c
@@ -1,5 +1,5 @@
 /*-
- *	$Id: dgm.c,v 1.15 1999/05/31 11:25:33 phk Exp $
+ * $FreeBSD$
  *
  *  This driver and the associated header files support the ISA PC/Xem
  *  Digiboards.  Its evolutionary roots are described below.
diff --git a/sys/dev/dgb/dgmbios.h b/sys/dev/dgb/dgmbios.h
index 3193c9dafb2ba..498bced5358ae 100644
--- a/sys/dev/dgb/dgmbios.h
+++ b/sys/dev/dgb/dgmbios.h
@@ -1,5 +1,5 @@
 /*
- *	$Id$
+ * $FreeBSD$
  *
  * This file is an ascii copy of the file sxbios.bin included in the
  * Digiboard PC/Xem driver for Linux.  It is copyright 1992, DIGI 
diff --git a/sys/dev/dgb/dgmfep.h b/sys/dev/dgb/dgmfep.h
index ed30e4a2fe6ff..7921fa3b058f5 100644
--- a/sys/dev/dgb/dgmfep.h
+++ b/sys/dev/dgb/dgmfep.h
@@ -1,5 +1,5 @@
 /*
- *	$Id$
+ * $FreeBSD$
  *
  * This file is an ascii copy of the file sxbios.bin included in the
  * Digiboard PC/Xem driver for Linux.  It is copyright 1992, DIGI 
diff --git a/sys/dev/dgb/dgmreg.h b/sys/dev/dgb/dgmreg.h
index 95fddf846d24b..2f052b530c116 100644
--- a/sys/dev/dgb/dgmreg.h
+++ b/sys/dev/dgb/dgmreg.h
@@ -1,5 +1,5 @@
 /*-
- *  dgmreg.h $Id: dgreg.h,v 1.4.2.1 1996/12/19 14:57:36 davidg Exp $
+ *  dgmreg.h $FreeBSD$
  *
  *  Digiboard driver.
  *
diff --git a/sys/dev/dgb/dgreg.h b/sys/dev/dgb/dgreg.h
index 8b520fb687ed2..73c29624294e0 100644
--- a/sys/dev/dgb/dgreg.h
+++ b/sys/dev/dgb/dgreg.h
@@ -1,5 +1,5 @@
 /*-
- *  dgreg.h $Id: dgreg.h,v 1.7 1997/02/22 09:29:43 peter Exp $
+ *  dgreg.h $FreeBSD$
  *
  *  Digiboard driver.
  *
diff --git a/sys/dev/dpt/dpt.h b/sys/dev/dpt/dpt.h
index 298f1326b8192..6202f5ac8c0a3 100644
--- a/sys/dev/dpt/dpt.h
+++ b/sys/dev/dpt/dpt.h
@@ -40,7 +40,7 @@
  */
 
 
-#ident "$Id: dpt.h,v 1.4 1998/09/22 04:55:07 gibbs Exp $"
+#ident "$FreeBSD$"
 
 #ifndef _DPT_H
 #define _DPT_H
diff --git a/sys/dev/dpt/dpt_control.c b/sys/dev/dpt/dpt_control.c
index 93a4b39b6b2a6..c676d8165b67b 100644
--- a/sys/dev/dpt/dpt_control.c
+++ b/sys/dev/dpt/dpt_control.c
@@ -36,7 +36,7 @@
  * future.
  */
 
-#ident "$Id: dpt_control.c,v 1.13 1999/05/30 16:51:20 phk Exp $"
+#ident "$FreeBSD$"
 
 #include "opt_dpt.h"
 
diff --git a/sys/dev/dpt/dpt_eisa.c b/sys/dev/dpt/dpt_eisa.c
index caeab91f30287..8518214db90b3 100644
--- a/sys/dev/dpt/dpt_eisa.c
+++ b/sys/dev/dpt/dpt_eisa.c
@@ -33,7 +33,7 @@
  */
 
 /*
- * $Id: dpt_eisa.c,v 1.7 1999/08/01 22:57:09 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include "eisa.h"
diff --git a/sys/dev/dpt/dpt_eisa.h b/sys/dev/dpt/dpt_eisa.h
index 0731911d36cb6..683ff655953c0 100644
--- a/sys/dev/dpt/dpt_eisa.h
+++ b/sys/dev/dpt/dpt_eisa.h
@@ -32,7 +32,7 @@
  */
 
 /*
- * $Id: dpt_eisa.h,v 1.2 1998/09/15 08:33:35 gibbs Exp $
+ * $FreeBSD$
  */
 
 #define DPT_EISA_SLOT_OFFSET		0xc00
diff --git a/sys/dev/dpt/dpt_pci.c b/sys/dev/dpt/dpt_pci.c
index 3828d08b6cb0f..9df90db97c002 100644
--- a/sys/dev/dpt/dpt_pci.c
+++ b/sys/dev/dpt/dpt_pci.c
@@ -32,7 +32,7 @@
  *  dptpci.c:  PCI Bus Attachment for DPT SCSI HBAs
  */
 
-#ident "$Id: dpt_pci.c,v 1.14 1999/08/16 01:52:20 gibbs Exp $"
+#ident "$FreeBSD$"
 
 #include "opt_dpt.h"
 
diff --git a/sys/dev/dpt/dpt_pci.h b/sys/dev/dpt/dpt_pci.h
index 4db7bf985f57e..fe7206a1882d9 100644
--- a/sys/dev/dpt/dpt_pci.h
+++ b/sys/dev/dpt/dpt_pci.h
@@ -28,7 +28,7 @@
  *
  */
 
-#ident "$Id: dpt_pci.h,v 1.3 1997/10/02 04:25:30 ShimonR Exp $"
+#ident "$FreeBSD$"
 
 #define DPT_VENDOR_ID             0x00001044
 #define DPT_DEVICE_ID             0x0000a400
diff --git a/sys/dev/dpt/dpt_scsi.c b/sys/dev/dpt/dpt_scsi.c
index c42f171e2a43b..5858ee2cbcbc8 100644
--- a/sys/dev/dpt/dpt_scsi.c
+++ b/sys/dev/dpt/dpt_scsi.c
@@ -43,7 +43,7 @@
  *	       arrays that span controllers (Wow!).
  */
 
-#ident "$Id: dpt_scsi.c,v 1.25 1999/08/21 06:24:02 msmith Exp $"
+#ident "$FreeBSD$"
 
 #define _DPT_C_
 
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index d65ac48c3d38c..fed261abfe59b 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.152 1999/05/09 23:24:45 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ed/if_ed_pci.c b/sys/dev/ed/if_ed_pci.c
index 5f9d2682061a8..023457e37c335 100644
--- a/sys/dev/ed/if_ed_pci.c
+++ b/sys/dev/ed/if_ed_pci.c
@@ -17,7 +17,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: if_ed_p.c,v 1.16 1999/05/09 17:06:52 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ed/if_edreg.h b/sys/dev/ed/if_edreg.h
index 20a14ed8d86e3..db1a89d9f7ecb 100644
--- a/sys/dev/ed/if_edreg.h
+++ b/sys/dev/ed/if_edreg.h
@@ -6,7 +6,7 @@
  *   of this software, nor does the author assume any responsibility
  *   for damages incurred with its use.
  *
- * $Id: if_edreg.h,v 1.24 1998/10/08 17:04:47 kato Exp $
+ * $FreeBSD$
  */
 /*
  * National Semiconductor DS8390 NIC register definitions
diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c
index 1aeb1df1af974..869ebbe6cabc5 100644
--- a/sys/dev/eisa/eisaconf.c
+++ b/sys/dev/eisa/eisaconf.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: eisaconf.c,v 1.50 1999/08/01 22:57:09 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include "opt_eisa.h"
diff --git a/sys/dev/eisa/eisaconf.h b/sys/dev/eisa/eisaconf.h
index 6174b6b369266..8330bb4a7353b 100644
--- a/sys/dev/eisa/eisaconf.h
+++ b/sys/dev/eisa/eisaconf.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: eisaconf.h,v 1.18 1999/04/18 15:50:33 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_EISA_EISACONF_H_
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index d1f3460aa545b..a4027a6ae37a5 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.83 1999/08/18 22:14:20 mdodd Exp $
+ * $FreeBSD$
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
diff --git a/sys/dev/ep/if_ep_eisa.c b/sys/dev/ep/if_ep_eisa.c
index b6ccff13af419..663409d4b75a6 100644
--- a/sys/dev/ep/if_ep_eisa.c
+++ b/sys/dev/ep/if_ep_eisa.c
@@ -19,7 +19,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: 3c5x9.c,v 1.12 1999/05/08 21:59:15 dfr Exp $
+ * $FreeBSD$
  */
 
 #include "eisa.h"
diff --git a/sys/dev/ep/if_epreg.h b/sys/dev/ep/if_epreg.h
index 997b228d01f72..08ff37be4fc7a 100644
--- a/sys/dev/ep/if_epreg.h
+++ b/sys/dev/ep/if_epreg.h
@@ -31,7 +31,7 @@
 
  */
 /*
- *  $Id: if_epreg.h,v 1.23 1998/04/17 22:36:35 des Exp $
+ * $FreeBSD$
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index 2aef5b290ac4f..bd8103e8bb7ce 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ex.c,v 1.17 1999/08/18 06:11:58 mdodd Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/fb/fb.c b/sys/dev/fb/fb.c
index ba697cfbe193d..86628aaaa3615 100644
--- a/sys/dev/fb/fb.c
+++ b/sys/dev/fb/fb.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: fb.c,v 1.7 1999/07/04 14:58:15 phk Exp $
+ * $FreeBSD$
  */
 
 #include "fb.h"
diff --git a/sys/dev/fb/fbreg.h b/sys/dev/fb/fbreg.h
index ff13bd8ae47da..0dc20165c4966 100644
--- a/sys/dev/fb/fbreg.h
+++ b/sys/dev/fb/fbreg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: fbreg.h,v 1.3 1999/04/12 13:34:56 des Exp $
+ * $FreeBSD$
  */
 
 #ifndef _DEV_FB_FBREG_H_
diff --git a/sys/dev/fb/splash.c b/sys/dev/fb/splash.c
index 6a6dce0fc4f3d..c75557083dc0b 100644
--- a/sys/dev/fb/splash.c
+++ b/sys/dev/fb/splash.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: splash.c,v 1.4 1999/06/22 14:13:24 yokota Exp $
+ * $FreeBSD$
  */
 
 #include "splash.h"
diff --git a/sys/dev/fb/splash_bmp.c b/sys/dev/fb/splash_bmp.c
index 6de5a28274d29..71a53b9c38a46 100644
--- a/sys/dev/fb/splash_bmp.c
+++ b/sys/dev/fb/splash_bmp.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: splash_bmp.c,v 1.8 1999/06/16 14:04:45 yokota Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/fb/splash_pcx.c b/sys/dev/fb/splash_pcx.c
index 9b81c3f7ae7de..544e8c795785e 100644
--- a/sys/dev/fb/splash_pcx.c
+++ b/sys/dev/fb/splash_pcx.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: splash_pcx.c,v 1.2 1999/06/22 14:14:06 yokota Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/fb/splashreg.h b/sys/dev/fb/splashreg.h
index a34a3b953b3e7..b0c7615623503 100644
--- a/sys/dev/fb/splashreg.h
+++ b/sys/dev/fb/splashreg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: splashreg.h,v 1.2 1999/01/11 03:06:28 yokota Exp $
+ * $FreeBSD$
  */
 
 #ifndef _DEV_FB_SPLASHREG_H_
diff --git a/sys/dev/fb/vga.c b/sys/dev/fb/vga.c
index d6cddaa22d7ee..6c96dae439a75 100644
--- a/sys/dev/fb/vga.c
+++ b/sys/dev/fb/vga.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: vga.c,v 1.2 1999/06/26 10:52:54 peter Exp $
+ * $FreeBSD$
  */
 
 #include "vga.h"
diff --git a/sys/dev/fb/vgareg.h b/sys/dev/fb/vgareg.h
index e9e9eb24a35fd..94c65e0976fe7 100644
--- a/sys/dev/fb/vgareg.h
+++ b/sys/dev/fb/vgareg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: vgareg.h,v 1.1 1999/01/09 02:44:49 yokota Exp $
+ * $FreeBSD$
  */
 
 #ifndef _DEV_FB_VGAREG_H_
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index c2670fdea6558..ce2ea33bc405e 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -47,7 +47,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.153 1999/08/23 20:58:59 phk Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/fdc/fdcreg.h b/sys/dev/fdc/fdcreg.h
index 7fef8ad098d4c..4d01c4121cea0 100644
--- a/sys/dev/fdc/fdcreg.h
+++ b/sys/dev/fdc/fdcreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)fdreg.h	7.1 (Berkeley) 5/9/91
- *	$Id: fdreg.h,v 1.10 1997/02/22 09:36:11 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index 00b793420dd1e..9e3dd65ac396a 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.53 1999/08/18 22:14:21 mdodd Exp $
+ * $FreeBSD$
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 3.x
diff --git a/sys/dev/fe/if_fereg.h b/sys/dev/fe/if_fereg.h
index d9b943c5febff..7e28201f69878 100644
--- a/sys/dev/fe/if_fereg.h
+++ b/sys/dev/fe/if_fereg.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: if_fereg.h,v 1.5 1997/02/22 09:36:28 peter Exp $ */
+/* $FreeBSD$ */
 
 /*
  * Registers on FMV-180 series' ISA bus interface ASIC.
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 724668c1a328c..ee97515fc1584 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_fxp.c,v 1.69 1999/05/09 10:45:54 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/fxp/if_fxpreg.h b/sys/dev/fxp/if_fxpreg.h
index d6db196244d76..e593608f0c3b8 100644
--- a/sys/dev/fxp/if_fxpreg.h
+++ b/sys/dev/fxp/if_fxpreg.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_fxpreg.h,v 1.14 1999/02/11 21:47:10 julian Exp $
+ * $FreeBSD$
  */
 
 #define FXP_VENDORID_INTEL	0x8086
diff --git a/sys/dev/fxp/if_fxpvar.h b/sys/dev/fxp/if_fxpvar.h
index 042d2df962841..7c4717db941e3 100644
--- a/sys/dev/fxp/if_fxpvar.h
+++ b/sys/dev/fxp/if_fxpvar.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_fxpvar.h,v 1.6 1998/08/02 00:29:15 dg Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/hea/eni.c b/sys/dev/hea/eni.c
index 70776809f0d17..ca7e2a3aad731 100644
--- a/sys/dev/hea/eni.c
+++ b/sys/dev/hea/eni.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni.c,v 1.8 1999/05/10 22:53:41 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef	lint
-__RCSID("@(#) $Id: eni.c,v 1.8 1999/05/10 22:53:41 mks Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 /*
diff --git a/sys/dev/hea/eni.h b/sys/dev/hea/eni.h
index ff4a81b0c2c4f..e44a2a9f43e69 100644
--- a/sys/dev/hea/eni.h
+++ b/sys/dev/hea/eni.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni.h,v 1.7 1998/06/29 19:45:14 jpt Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/dev/hea/eni_buffer.c b/sys/dev/hea/eni_buffer.c
index 509818d68f1da..1051dd4993501 100644
--- a/sys/dev/hea/eni_buffer.c
+++ b/sys/dev/hea/eni_buffer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_buffer.c,v 1.3 1999/04/11 02:55:51 eivind Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: eni_buffer.c,v 1.3 1999/04/11 02:55:51 eivind Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 static int	eni_test_memory __P((Eni_unit *));
diff --git a/sys/dev/hea/eni_globals.c b/sys/dev/hea/eni_globals.c
index 2f84e0b9da293..0c7d5207e81bf 100644
--- a/sys/dev/hea/eni_globals.c
+++ b/sys/dev/hea/eni_globals.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_globals.c,v 1.2 1998/10/31 20:06:45 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: eni_globals.c,v 1.2 1998/10/31 20:06:45 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 /*
diff --git a/sys/dev/hea/eni_if.c b/sys/dev/hea/eni_if.c
index 00f92337a2213..08ce89a63ce29 100644
--- a/sys/dev/hea/eni_if.c
+++ b/sys/dev/hea/eni_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_if.c,v 1.3 1998/12/04 22:54:45 archie Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: eni_if.c,v 1.3 1998/12/04 22:54:45 archie Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 static void	eni_get_stats __P((Eni_unit *));
diff --git a/sys/dev/hea/eni_init.c b/sys/dev/hea/eni_init.c
index 5706c65adb32b..996c0eccb9a17 100644
--- a/sys/dev/hea/eni_init.c
+++ b/sys/dev/hea/eni_init.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_init.c,v 1.1 1998/09/15 08:22:53 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: eni_init.c,v 1.1 1998/09/15 08:22:53 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 /*
diff --git a/sys/dev/hea/eni_intr.c b/sys/dev/hea/eni_intr.c
index ccc0d6bbc5475..cbf7ef02eaa88 100644
--- a/sys/dev/hea/eni_intr.c
+++ b/sys/dev/hea/eni_intr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_intr.c,v 1.2 1998/09/17 09:34:58 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: eni_intr.c,v 1.2 1998/09/17 09:34:58 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 static void	eni_suni_intr __P((Eni_unit *));
diff --git a/sys/dev/hea/eni_receive.c b/sys/dev/hea/eni_receive.c
index 883602bb065a4..2722233afd8a8 100644
--- a/sys/dev/hea/eni_receive.c
+++ b/sys/dev/hea/eni_receive.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_receive.c,v 1.3 1998/10/31 20:06:45 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: eni_receive.c,v 1.3 1998/10/31 20:06:45 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 static void	eni_recv_stack __P((void *, KBuffer *));
diff --git a/sys/dev/hea/eni_stats.h b/sys/dev/hea/eni_stats.h
index 1f2a4139f5fb0..ddcc55ff775c5 100644
--- a/sys/dev/hea/eni_stats.h
+++ b/sys/dev/hea/eni_stats.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_stats.h,v 1.6 1998/08/26 23:28:54 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/dev/hea/eni_suni.h b/sys/dev/hea/eni_suni.h
index 3a0b0f74bec08..3ebce60306797 100644
--- a/sys/dev/hea/eni_suni.h
+++ b/sys/dev/hea/eni_suni.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_suni.h,v 1.2 1997/05/06 22:08:17 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/dev/hea/eni_transmit.c b/sys/dev/hea/eni_transmit.c
index f44ec41223e45..c804383746731 100644
--- a/sys/dev/hea/eni_transmit.c
+++ b/sys/dev/hea/eni_transmit.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_transmit.c,v 1.3 1998/10/31 20:06:45 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: eni_transmit.c,v 1.3 1998/10/31 20:06:45 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 /*
diff --git a/sys/dev/hea/eni_var.h b/sys/dev/hea/eni_var.h
index cc83a122dbdc9..f13a99d94faba 100644
--- a/sys/dev/hea/eni_var.h
+++ b/sys/dev/hea/eni_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_var.h,v 1.4 1998/06/29 19:55:26 jpt Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/dev/hea/eni_vcm.c b/sys/dev/hea/eni_vcm.c
index a88fc01bc67ad..d552ddf89a181 100644
--- a/sys/dev/hea/eni_vcm.c
+++ b/sys/dev/hea/eni_vcm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_vcm.c,v 1.1 1998/09/15 08:22:54 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: eni_vcm.c,v 1.1 1998/09/15 08:22:54 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/dev/hfa/fore.h b/sys/dev/hfa/fore.h
index 42f44f0665b17..04099824075eb 100644
--- a/sys/dev/hfa/fore.h
+++ b/sys/dev/hfa/fore.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore.h,v 1.8 1998/08/26 23:28:57 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/dev/hfa/fore_aali.h b/sys/dev/hfa/fore_aali.h
index d59dcfce3b105..c5bf8038f1a3b 100644
--- a/sys/dev/hfa/fore_aali.h
+++ b/sys/dev/hfa/fore_aali.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_aali.h,v 1.5 1997/05/09 00:42:25 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/dev/hfa/fore_buffer.c b/sys/dev/hfa/fore_buffer.c
index ccf91b372e281..ff3396d972e7d 100644
--- a/sys/dev/hfa/fore_buffer.c
+++ b/sys/dev/hfa/fore_buffer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_buffer.c,v 1.2 1998/10/31 20:06:52 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_buffer.c,v 1.2 1998/10/31 20:06:52 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_command.c b/sys/dev/hfa/fore_command.c
index bb4187f4fc36a..5823a3623c5d6 100644
--- a/sys/dev/hfa/fore_command.c
+++ b/sys/dev/hfa/fore_command.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_command.c,v 1.4 1998/12/04 22:54:45 archie Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_command.c,v 1.4 1998/12/04 22:54:45 archie Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 /*
diff --git a/sys/dev/hfa/fore_globals.c b/sys/dev/hfa/fore_globals.c
index dae4c34371d20..ff8cc6c2e9497 100644
--- a/sys/dev/hfa/fore_globals.c
+++ b/sys/dev/hfa/fore_globals.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_globals.c,v 1.2 1998/10/31 20:06:52 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_globals.c,v 1.2 1998/10/31 20:06:52 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_if.c b/sys/dev/hfa/fore_if.c
index 2c4a9de219643..930e0f9f0ec95 100644
--- a/sys/dev/hfa/fore_if.c
+++ b/sys/dev/hfa/fore_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_if.c,v 1.3 1998/12/04 22:54:45 archie Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_if.c,v 1.3 1998/12/04 22:54:45 archie Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_include.h b/sys/dev/hfa/fore_include.h
index b146a3cc7d411..4ffe4ce424c6d 100644
--- a/sys/dev/hfa/fore_include.h
+++ b/sys/dev/hfa/fore_include.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_include.h,v 1.8 1998/02/19 20:10:18 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/dev/hfa/fore_init.c b/sys/dev/hfa/fore_init.c
index 7c1ee96dd9055..1594f3e6b06e1 100644
--- a/sys/dev/hfa/fore_init.c
+++ b/sys/dev/hfa/fore_init.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_init.c,v 1.3 1998/10/31 20:06:53 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_init.c,v 1.3 1998/10/31 20:06:53 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_intr.c b/sys/dev/hfa/fore_intr.c
index 6fba5f224a7c3..aa7f05cce99aa 100644
--- a/sys/dev/hfa/fore_intr.c
+++ b/sys/dev/hfa/fore_intr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_intr.c,v 1.1 1998/09/15 08:22:55 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_intr.c,v 1.1 1998/09/15 08:22:55 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 #if defined(sun)
diff --git a/sys/dev/hfa/fore_load.c b/sys/dev/hfa/fore_load.c
index f7eeeeced31f5..bdb42cabfb302 100644
--- a/sys/dev/hfa/fore_load.c
+++ b/sys/dev/hfa/fore_load.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_load.c,v 1.9 1999/05/30 16:51:25 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_load.c,v 1.9 1999/05/30 16:51:25 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_output.c b/sys/dev/hfa/fore_output.c
index 0a5bcd2ca86cd..e67874c4b5848 100644
--- a/sys/dev/hfa/fore_output.c
+++ b/sys/dev/hfa/fore_output.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_output.c,v 1.2 1998/10/31 20:06:53 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_output.c,v 1.2 1998/10/31 20:06:53 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_receive.c b/sys/dev/hfa/fore_receive.c
index a86545c6db7ab..be07791aae6e7 100644
--- a/sys/dev/hfa/fore_receive.c
+++ b/sys/dev/hfa/fore_receive.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_receive.c,v 1.3 1998/10/31 20:06:53 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_receive.c,v 1.3 1998/10/31 20:06:53 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_slave.h b/sys/dev/hfa/fore_slave.h
index 05e7b5be8cfeb..9f7d3224fcb43 100644
--- a/sys/dev/hfa/fore_slave.h
+++ b/sys/dev/hfa/fore_slave.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_slave.h,v 1.5 1997/08/22 19:45:50 jpt Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/dev/hfa/fore_stats.c b/sys/dev/hfa/fore_stats.c
index c1a1fab14e817..a01c5e50f6a70 100644
--- a/sys/dev/hfa/fore_stats.c
+++ b/sys/dev/hfa/fore_stats.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_stats.c,v 1.2 1998/09/17 09:34:59 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_stats.c,v 1.2 1998/09/17 09:34:59 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_stats.h b/sys/dev/hfa/fore_stats.h
index 3803ddd20ef82..53b568f69ebd0 100644
--- a/sys/dev/hfa/fore_stats.h
+++ b/sys/dev/hfa/fore_stats.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_stats.h,v 1.3 1997/05/06 22:10:21 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/dev/hfa/fore_timer.c b/sys/dev/hfa/fore_timer.c
index 15cb02efbe65d..df5cff86b42a4 100644
--- a/sys/dev/hfa/fore_timer.c
+++ b/sys/dev/hfa/fore_timer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_timer.c,v 1.1 1998/09/15 08:22:56 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_timer.c,v 1.1 1998/09/15 08:22:56 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_transmit.c b/sys/dev/hfa/fore_transmit.c
index 4be4a8984892b..45445d4203139 100644
--- a/sys/dev/hfa/fore_transmit.c
+++ b/sys/dev/hfa/fore_transmit.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_transmit.c,v 1.2 1998/10/31 20:06:53 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_transmit.c,v 1.2 1998/10/31 20:06:53 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/dev/hfa/fore_var.h b/sys/dev/hfa/fore_var.h
index 25d21319ecc69..5a1533f3c2c68 100644
--- a/sys/dev/hfa/fore_var.h
+++ b/sys/dev/hfa/fore_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_var.h,v 1.8 1998/02/19 20:10:53 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/dev/hfa/fore_vcm.c b/sys/dev/hfa/fore_vcm.c
index 325883b31b6eb..e2bc530ef5e3d 100644
--- a/sys/dev/hfa/fore_vcm.c
+++ b/sys/dev/hfa/fore_vcm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_vcm.c,v 1.2 1998/09/17 09:34:59 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_vcm.c,v 1.2 1998/09/17 09:34:59 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/dev/ic/cd1400.h b/sys/dev/ic/cd1400.h
index ee9b9f27a4ddb..90672c4ee7e6a 100644
--- a/sys/dev/ic/cd1400.h
+++ b/sys/dev/ic/cd1400.h
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cd1400.h,v 1.4 1997/02/22 09:37:59 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ic/esp.h b/sys/dev/ic/esp.h
index 6621e6503917c..a381ee7d22aae 100644
--- a/sys/dev/ic/esp.h
+++ b/sys/dev/ic/esp.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _IC_ESP_H_
diff --git a/sys/dev/ic/hd64570.h b/sys/dev/ic/hd64570.h
index e26e89fb789cf..b676e25a9cd5c 100644
--- a/sys/dev/ic/hd64570.h
+++ b/sys/dev/ic/hd64570.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifndef _HD64570_H_
 #define _HD64570_H_
diff --git a/sys/dev/ic/i8237.h b/sys/dev/ic/i8237.h
index e955a33b833dd..2bc8a08317c66 100644
--- a/sys/dev/ic/i8237.h
+++ b/sys/dev/ic/i8237.h
@@ -1,7 +1,7 @@
 /*
  * Intel 8237 DMA Controller
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #define	DMA37MD_SINGLE	0x40	/* single pass mode */
diff --git a/sys/dev/ic/i82586.h b/sys/dev/ic/i82586.h
index 704d624b77ae6..964621bd36773 100644
--- a/sys/dev/ic/i82586.h
+++ b/sys/dev/ic/i82586.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: i82586.h,v 1.7 1998/08/10 17:21:48 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ic/nec765.h b/sys/dev/ic/nec765.h
index 3a5561888e874..c08b73b7d6003 100644
--- a/sys/dev/ic/nec765.h
+++ b/sys/dev/ic/nec765.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)nec765.h	7.1 (Berkeley) 5/9/91
- *	$Id: nec765.h,v 1.6 1997/02/22 09:38:04 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ic/ns16550.h b/sys/dev/ic/ns16550.h
index ba338886c764b..e8fad7da832e8 100644
--- a/sys/dev/ic/ns16550.h
+++ b/sys/dev/ic/ns16550.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ns16550.h	7.1 (Berkeley) 5/9/91
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ida/ida.c b/sys/dev/ida/ida.c
index b7fca561cf416..509d0465e908d 100644
--- a/sys/dev/ida/ida.c
+++ b/sys/dev/ida/ida.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ida.c,v 1.1 1999/06/24 03:31:57 jlemon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c
index 456491623e4e0..24be38be7e3ac 100644
--- a/sys/dev/ida/ida_disk.c
+++ b/sys/dev/ida/ida_disk.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ida_disk.c,v 1.2 1999/07/04 14:58:16 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ida/ida_pci.c b/sys/dev/ida/ida_pci.c
index 330ce7ca1941a..70007fb87d436 100644
--- a/sys/dev/ida/ida_pci.c
+++ b/sys/dev/ida/ida_pci.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ida_pci.c,v 1.3 1999/07/29 01:03:02 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ida/idareg.h b/sys/dev/ida/idareg.h
index 69c39650b80f2..506c495cd7797 100644
--- a/sys/dev/ida/idareg.h
+++ b/sys/dev/ida/idareg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ida/idavar.h b/sys/dev/ida/idavar.h
index 7b8012a8e3b2f..75401b476d8a5 100644
--- a/sys/dev/ida/idavar.h
+++ b/sys/dev/ida/idavar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index d6c928b98f9c9..83142b44bde76 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.66 1999/08/21 06:24:14 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ie/if_ie507.h b/sys/dev/ie/if_ie507.h
index 7583ffd0a0373..9be1396cf49e2 100644
--- a/sys/dev/ie/if_ie507.h
+++ b/sys/dev/ie/if_ie507.h
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $FreeBSD$
  * Definitions for 3C507
  */
 
diff --git a/sys/dev/ie/if_iereg.h b/sys/dev/ie/if_iereg.h
index 3588b84140580..875f63ca9dbb5 100644
--- a/sys/dev/ie/if_iereg.h
+++ b/sys/dev/ie/if_iereg.h
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $FreeBSD$
  * definitions for AT&T StarLAN 10 etc...
  */
 
diff --git a/sys/dev/iicbus/if_ic.c b/sys/dev/iicbus/if_ic.c
index 58144d052d777..a9649ea357c51 100644
--- a/sys/dev/iicbus/if_ic.c
+++ b/sys/dev/iicbus/if_ic.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ic.c,v 1.4 1999/05/08 21:59:03 dfr Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c
index bb4ee16e50985..158449e9bf14c 100644
--- a/sys/dev/iicbus/iic.c
+++ b/sys/dev/iicbus/iic.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iic.c,v 1.12 1999/05/31 11:24:43 phk Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/iicbus/iic.h b/sys/dev/iicbus/iic.h
index 6649821e0240a..5d362c1a2dd42 100644
--- a/sys/dev/iicbus/iic.h
+++ b/sys/dev/iicbus/iic.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iic.h,v 1.1 1998/09/03 21:00:08 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __IIC_H
diff --git a/sys/dev/iicbus/iicbb.c b/sys/dev/iicbus/iicbb.c
index df46c1ad859e4..b4e4f63276d21 100644
--- a/sys/dev/iicbus/iicbb.c
+++ b/sys/dev/iicbus/iicbb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iicbb.c,v 1.4 1999/05/08 21:59:04 dfr Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/iicbus/iicbb_if.m b/sys/dev/iicbus/iicbb_if.m
index bdf1108fac95a..a99bfe86b8882 100644
--- a/sys/dev/iicbus/iicbb_if.m
+++ b/sys/dev/iicbus/iicbb_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id: iicbb_if.m,v 1.1 1998/10/31 11:31:07 nsouch Exp $
+# $FreeBSD$
 #
 
 INTERFACE iicbb;
diff --git a/sys/dev/iicbus/iicbus.c b/sys/dev/iicbus/iicbus.c
index e97cbfb0cde6f..e4b6f8d45e399 100644
--- a/sys/dev/iicbus/iicbus.c
+++ b/sys/dev/iicbus/iicbus.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iicbus.c,v 1.9 1999/05/08 21:59:04 dfr Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/iicbus/iicbus.h b/sys/dev/iicbus/iicbus.h
index 3c230955bbc12..59bbaef4d3fe2 100644
--- a/sys/dev/iicbus/iicbus.h
+++ b/sys/dev/iicbus/iicbus.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iicbus.h,v 1.2 1998/10/31 11:31:07 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __IICBUS_H
diff --git a/sys/dev/iicbus/iicbus_if.m b/sys/dev/iicbus/iicbus_if.m
index 7e29333db4954..ba30c61e0b9f5 100644
--- a/sys/dev/iicbus/iicbus_if.m
+++ b/sys/dev/iicbus/iicbus_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id: iicbus_if.m,v 1.2 1998/10/31 11:31:07 nsouch Exp $
+# $FreeBSD$
 #
 
 INTERFACE iicbus;
diff --git a/sys/dev/iicbus/iiconf.c b/sys/dev/iicbus/iiconf.c
index 5727c05801577..42d3a9621c084 100644
--- a/sys/dev/iicbus/iiconf.c
+++ b/sys/dev/iicbus/iiconf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iiconf.c,v 1.6 1999/02/06 10:56:09 roger Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/iicbus/iiconf.h b/sys/dev/iicbus/iiconf.h
index 4c2376251f1df..03a4a762efd55 100644
--- a/sys/dev/iicbus/iiconf.h
+++ b/sys/dev/iicbus/iiconf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iiconf.h,v 1.4 1999/01/27 21:49:53 dillon Exp $
+ * $FreeBSD$
  */
 #ifndef __IICONF_H
 #define __IICONF_H
diff --git a/sys/dev/iicbus/iicsmb.c b/sys/dev/iicbus/iicsmb.c
index 4cea0b5dc2a73..f967551a9d4d0 100644
--- a/sys/dev/iicbus/iicsmb.c
+++ b/sys/dev/iicbus/iicsmb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iicsmb.c,v 1.3 1999/05/08 21:59:05 dfr Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/isp/asm_pci.h b/sys/dev/isp/asm_pci.h
index 513cd54a4327a..96c4ca7972006 100644
--- a/sys/dev/isp/asm_pci.h
+++ b/sys/dev/isp/asm_pci.h
@@ -1,4 +1,4 @@
-/* $Id: asm_pci.h,v 1.12 1999/07/05 20:42:03 mjacob Exp $ */
+/* $FreeBSD$ */
 /* release_6_5_99 */
 /*
  * Copyright (c) 1995, 1996, 1997, 1998 by Qlogic Corporation
diff --git a/sys/dev/isp/asm_sbus.h b/sys/dev/isp/asm_sbus.h
index b521b934d2fe2..8165fe1489cfa 100644
--- a/sys/dev/isp/asm_sbus.h
+++ b/sys/dev/isp/asm_sbus.h
@@ -1,4 +1,4 @@
-/* $Id: asm_sbus.h,v 1.6 1999/03/17 05:04:38 mjacob Exp $ */
+/* $FreeBSD$ */
 /* release_03_25_99 */
 /*
  * SBus Qlogic Host Adapter Firmware Tables
diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c
index e69eb1a8bef37..377632e2a39b7 100644
--- a/sys/dev/isp/isp.c
+++ b/sys/dev/isp/isp.c
@@ -1,4 +1,4 @@
-/* $Id: isp.c,v 1.22 1999/07/05 20:42:06 mjacob Exp $ */
+/* $FreeBSD$ */
 /*
  * Machine and OS Independent (well, as best as possible)
  * code for the Qlogic ISP SCSI adapters.
diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c
index dd368dedce2a5..5e6c84c5b9d92 100644
--- a/sys/dev/isp/isp_freebsd.c
+++ b/sys/dev/isp/isp_freebsd.c
@@ -1,4 +1,4 @@
-/* $Id: isp_freebsd.c,v 1.22 1999/07/05 20:42:07 mjacob Exp $ */
+/* $FreeBSD$ */
 /*
  * Platform (FreeBSD) dependent common attachment code for Qlogic adapters.
  *
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h
index 552808d6584fa..12bc9f2593b7f 100644
--- a/sys/dev/isp/isp_freebsd.h
+++ b/sys/dev/isp/isp_freebsd.h
@@ -1,4 +1,4 @@
-/* $Id: isp_freebsd.h,v 1.17 1999/07/05 20:42:07 mjacob Exp $ */
+/* $FreeBSD$ */
 /*
  * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions (CAM version)
  *---------------------------------------
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c
index 8fd49bbfd562a..1aa31953b36bb 100644
--- a/sys/dev/isp/isp_pci.c
+++ b/sys/dev/isp/isp_pci.c
@@ -1,4 +1,4 @@
-/* $Id: isp_pci.c,v 1.30 1999/08/16 19:52:29 mjacob Exp $ */
+/* $FreeBSD$ */
 /*
  * PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
  * FreeBSD Version.
diff --git a/sys/dev/isp/ispmbox.h b/sys/dev/isp/ispmbox.h
index 62c815f0d98b4..c4efab2f81ba1 100644
--- a/sys/dev/isp/ispmbox.h
+++ b/sys/dev/isp/ispmbox.h
@@ -1,4 +1,4 @@
-/* $Id: ispmbox.h,v 1.12 1999/07/05 20:42:07 mjacob Exp $ */
+/* $FreeBSD$ */
 /*
  * Mailbox and Queue Entry Definitions for for Qlogic ISP SCSI adapters.
  *
diff --git a/sys/dev/isp/ispreg.h b/sys/dev/isp/ispreg.h
index 26e1c37488c42..893f69784672c 100644
--- a/sys/dev/isp/ispreg.h
+++ b/sys/dev/isp/ispreg.h
@@ -1,4 +1,4 @@
-/* $Id: ispreg.h,v 1.8 1999/03/25 22:52:45 mjacob Exp $ */
+/* $FreeBSD$ */
 /* release_5_11_99 */
 /*
  * Machine Independent (well, as best as possible) register
diff --git a/sys/dev/isp/ispvar.h b/sys/dev/isp/ispvar.h
index 5596934e89716..7a70c137575d7 100644
--- a/sys/dev/isp/ispvar.h
+++ b/sys/dev/isp/ispvar.h
@@ -1,4 +1,4 @@
-/* $Id: ispvar.h,v 1.17 1999/07/05 20:42:08 mjacob Exp $ */
+/* $FreeBSD$ */
 /*
  * Soft Definitions for for Qlogic ISP SCSI adapters.
  *
diff --git a/sys/dev/kbd/atkbd.c b/sys/dev/kbd/atkbd.c
index 3786ee9a0b988..3094c60140df2 100644
--- a/sys/dev/kbd/atkbd.c
+++ b/sys/dev/kbd/atkbd.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: atkbd.c,v 1.14 1999/08/22 09:52:32 yokota Exp $
+ * $FreeBSD$
  */
 
 #include "atkbd.h"
diff --git a/sys/dev/kbd/atkbdc.c b/sys/dev/kbd/atkbdc.c
index ded635795b0d2..68fcffc293342 100644
--- a/sys/dev/kbd/atkbdc.c
+++ b/sys/dev/kbd/atkbdc.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: atkbdc.c,v 1.2 1999/05/18 11:33:04 yokota Exp $
+ * $FreeBSD$
  * from kbdio.c,v 1.13 1998/09/25 11:55:46 yokota Exp
  */
 
diff --git a/sys/dev/kbd/atkbdcreg.h b/sys/dev/kbd/atkbdcreg.h
index ccf64e4032c7c..2085bb67bb92a 100644
--- a/sys/dev/kbd/atkbdcreg.h
+++ b/sys/dev/kbd/atkbdcreg.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: atkbdcreg.h,v 1.1 1999/01/09 02:44:50 yokota Exp $
+ * $FreeBSD$
  * from kbdio.h,v 1.8 1998/09/25 11:55:46 yokota Exp
  */
 
diff --git a/sys/dev/kbd/atkbdreg.h b/sys/dev/kbd/atkbdreg.h
index 04401520b759e..bda6afb8582df 100644
--- a/sys/dev/kbd/atkbdreg.h
+++ b/sys/dev/kbd/atkbdreg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: atkbdreg.h,v 1.2 1999/03/10 10:36:52 yokota Exp $
+ * $FreeBSD$
  */
 
 #ifndef _DEV_KBD_ATKBDREG_H_
diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c
index 869a8ffa29822..945df72e20509 100644
--- a/sys/dev/kbd/kbd.c
+++ b/sys/dev/kbd/kbd.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: kbd.c,v 1.9 1999/05/31 11:24:48 phk Exp $
+ * $FreeBSD$
  */
 
 #include "kbd.h"
diff --git a/sys/dev/kbd/kbdreg.h b/sys/dev/kbd/kbdreg.h
index b074e11a7d5aa..4fc5fd63ec97f 100644
--- a/sys/dev/kbd/kbdreg.h
+++ b/sys/dev/kbd/kbdreg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: kbdreg.h,v 1.3 1999/03/10 10:36:52 yokota Exp $
+ * $FreeBSD$
  */
 
 #ifndef _DEV_KBD_KBDREG_H_
diff --git a/sys/dev/kbd/kbdtables.h b/sys/dev/kbd/kbdtables.h
index f262ec6ca17ea..68ef5e2fa377d 100644
--- a/sys/dev/kbd/kbdtables.h
+++ b/sys/dev/kbd/kbdtables.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: kbdtables.h,v 1.44 1999/01/28 10:55:55 yokota Exp $
+ * $FreeBSD$
  */
 
 #ifndef KBD_DFLT_KEYMAP
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c
index 058ca3f574262..6345dffd1131a 100644
--- a/sys/dev/lnc/if_lnc.c
+++ b/sys/dev/lnc/if_lnc.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_lnc.c,v 1.64 1999/08/18 22:14:23 mdodd Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/lnc/if_lnc_pci.c b/sys/dev/lnc/if_lnc_pci.c
index c92ffc083bc72..33c7212295eed 100644
--- a/sys/dev/lnc/if_lnc_pci.c
+++ b/sys/dev/lnc/if_lnc_pci.c
@@ -17,7 +17,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: if_lnc_p.c,v 1.11 1999/07/03 20:17:04 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/lnc/if_lncvar.h b/sys/dev/lnc/if_lncvar.h
index aeff426d5e173..f3d37f44654ce 100644
--- a/sys/dev/lnc/if_lncvar.h
+++ b/sys/dev/lnc/if_lncvar.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_lnc.h,v 1.11 1999/07/06 19:22:51 des Exp $
+ * $FreeBSD$
  */
 
 #include <i386/isa/ic/Am7990.h>
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index 0f5001715722d..5ab40ef0761c0 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -40,7 +40,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.108 1999/05/31 11:26:15 phk Exp $
+ * $FreeBSD$
  */
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
diff --git a/sys/dev/mcd/mcdreg.h b/sys/dev/mcd/mcdreg.h
index 219e119d5a874..f0f75f7b2254a 100644
--- a/sys/dev/mcd/mcdreg.h
+++ b/sys/dev/mcd/mcdreg.h
@@ -41,7 +41,7 @@
  * the manufacturer or anyone else might provide better documentation,
  * so this file (and the driver) will then have a better quality.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef MCD_H
diff --git a/sys/dev/mii/Makefile.miidevs b/sys/dev/mii/Makefile.miidevs
index 440af1d34922c..964ecf3839b5b 100644
--- a/sys/dev/mii/Makefile.miidevs
+++ b/sys/dev/mii/Makefile.miidevs
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile.miidevs,v 1.1 1998/08/10 23:55:17 thorpej Exp $
-#	$Id$
+# $FreeBSD$
 
 AWK=	awk
 
diff --git a/sys/dev/mii/devlist2h.awk b/sys/dev/mii/devlist2h.awk
index c6872bc5a8e7a..1863a227ab7f7 100644
--- a/sys/dev/mii/devlist2h.awk
+++ b/sys/dev/mii/devlist2h.awk
@@ -64,7 +64,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#	$Id$
+# $FreeBSD$
 #
 function collectline(f, line) {
 	oparen = 0
diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c
index 86c624b1321c5..9284c7ae11bed 100644
--- a/sys/dev/mii/exphy.c
+++ b/sys/dev/mii/exphy.c
@@ -89,7 +89,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 
 static int exphy_probe		__P((device_t));
diff --git a/sys/dev/mii/mii.c b/sys/dev/mii/mii.c
index 833c3a24064e9..e64488fa0a591 100644
--- a/sys/dev/mii/mii.c
+++ b/sys/dev/mii/mii.c
@@ -60,7 +60,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: mii.c,v 1.1 1999/08/21 17:40:41 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 static int miibus_readreg	__P((device_t, int, int));
diff --git a/sys/dev/mii/mii.h b/sys/dev/mii/mii.h
index 6c94671c371b2..c21fe03770852 100644
--- a/sys/dev/mii/mii.h
+++ b/sys/dev/mii/mii.h
@@ -31,7 +31,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _DEV_MII_MII_H_
diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c
index 408fa12b03ab1..ff4719050930a 100644
--- a/sys/dev/mii/mii_physubr.c
+++ b/sys/dev/mii/mii_physubr.c
@@ -61,7 +61,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 
 void	mii_phy_auto_timeout __P((void *));
diff --git a/sys/dev/mii/miibus_if.m b/sys/dev/mii/miibus_if.m
index 2bf1dd1daa70c..d540964cb1024 100644
--- a/sys/dev/mii/miibus_if.m
+++ b/sys/dev/mii/miibus_if.m
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 INTERFACE miibus;
 
diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs
index 9fcb55cec1509..ed86e437b5608 100644
--- a/sys/dev/mii/miidevs
+++ b/sys/dev/mii/miidevs
@@ -1,4 +1,4 @@
-$Id$
+$FreeBSD$
 /*$NetBSD: miidevs,v 1.6 1999/05/14 11:37:30 drochner Exp $*/
 
 /*-
diff --git a/sys/dev/mii/miidevs.h b/sys/dev/mii/miidevs.h
index 0177c202045d9..11689a42bc3c7 100644
--- a/sys/dev/mii/miidevs.h
+++ b/sys/dev/mii/miidevs.h
@@ -1,4 +1,4 @@
-/*	$Id$	*/
+/* $FreeBSD$	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
diff --git a/sys/dev/mii/miivar.h b/sys/dev/mii/miivar.h
index bd5121e711cbf..52380fa946e30 100644
--- a/sys/dev/mii/miivar.h
+++ b/sys/dev/mii/miivar.h
@@ -36,7 +36,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * 	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _DEV_MII_MIIVAR_H_
diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c
index ac4cc7ab13338..4c58a4e5d1e99 100644
--- a/sys/dev/mii/nsphy.c
+++ b/sys/dev/mii/nsphy.c
@@ -93,7 +93,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 
 static int nsphy_probe		__P((device_t));
diff --git a/sys/dev/mii/nsphyreg.h b/sys/dev/mii/nsphyreg.h
index 9d9614286eb42..5ff0490b1dfe5 100644
--- a/sys/dev/mii/nsphyreg.h
+++ b/sys/dev/mii/nsphyreg.h
@@ -36,7 +36,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _DEV_MII_NSPHYREG_H_
diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c
index 2efd30588526a..cb22eab1cefee 100644
--- a/sys/dev/mii/ukphy.c
+++ b/sys/dev/mii/ukphy.c
@@ -91,7 +91,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 
 static int ukphy_probe		__P((device_t));
diff --git a/sys/dev/mii/ukphy_subr.c b/sys/dev/mii/ukphy_subr.c
index 11904a21601d7..d39ef4651b936 100644
--- a/sys/dev/mii/ukphy_subr.c
+++ b/sys/dev/mii/ukphy_subr.c
@@ -59,7 +59,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index ddc41a8215f50..f6d6c663652b2 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $Id: mse.c,v 1.44 1999/05/31 11:26:17 phk Exp $
+ * $FreeBSD$
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
diff --git a/sys/dev/pccard/if_xe.c b/sys/dev/pccard/if_xe.c
index 4d67a35a54dc0..d8351f09f730e 100644
--- a/sys/dev/pccard/if_xe.c
+++ b/sys/dev/pccard/if_xe.c
@@ -23,8 +23,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_xe.c,v 1.20 1999/06/13 19:17:40 scott Exp $
- *	$FreeBSD$
+ * $FreeBSD$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/pccard/if_xereg.h b/sys/dev/pccard/if_xereg.h
index a4ecb35da19c7..9eb7d3138288d 100644
--- a/sys/dev/pccard/if_xereg.h
+++ b/sys/dev/pccard/if_xereg.h
@@ -23,8 +23,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_xereg.h,v 1.5 1999/05/20 21:53:58 scott Exp $
- *	$FreeBSD$
+ * $FreeBSD$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/pcf/pcf.c b/sys/dev/pcf/pcf.c
index e5498b40b5fdf..8cebfb004c0dd 100644
--- a/sys/dev/pcf/pcf.c
+++ b/sys/dev/pcf/pcf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: pcf.c,v 1.9 1999/05/08 21:59:27 dfr Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index 75f41e87c72b3..214d6f96b80ff 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pci.c,v 1.114 1999/07/29 01:03:03 mdodd Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/pci/pci_if.m b/sys/dev/pci/pci_if.m
index b2fa6758fef6a..95b0081ca32bd 100644
--- a/sys/dev/pci/pci_if.m
+++ b/sys/dev/pci/pci_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id$
+# $FreeBSD$
 #
 
 INTERFACE pci;
diff --git a/sys/dev/pci/pcireg.h b/sys/dev/pci/pcireg.h
index 9c0dba09331d2..f90df10e14de0 100644
--- a/sys/dev/pci/pcireg.h
+++ b/sys/dev/pci/pcireg.h
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcireg.h,v 1.20 1998/10/07 03:40:51 gibbs Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
index f1c6f5e4d7447..ae4958dbf2654 100644
--- a/sys/dev/pci/pcivar.h
+++ b/sys/dev/pci/pcivar.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcivar.h,v 1.33 1999/05/20 15:33:33 gallatin Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/pdq/if_fea.c b/sys/dev/pdq/if_fea.c
index c98eb4bf96af3..21c90d4a7dd68 100644
--- a/sys/dev/pdq/if_fea.c
+++ b/sys/dev/pdq/if_fea.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_fea.c,v 1.16 1999/07/31 00:43:48 mdodd Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/pdq/if_fpa.c b/sys/dev/pdq/if_fpa.c
index 7d816b8c8075d..d70628a9e7080 100644
--- a/sys/dev/pdq/if_fpa.c
+++ b/sys/dev/pdq/if_fpa.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_fpa.c,v 1.11 1999/08/21 06:24:34 msmith Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/pdq/pdq.c b/sys/dev/pdq/pdq.c
index cb0e531221d51..055bdc2f9d283 100644
--- a/sys/dev/pdq/pdq.c
+++ b/sys/dev/pdq/pdq.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pdq.c,v 1.3 1999/01/27 19:35:33 dillon Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/pdq/pdq_ifsubr.c b/sys/dev/pdq/pdq_ifsubr.c
index 6bcb5c7b29c25..545d66ccf3f60 100644
--- a/sys/dev/pdq/pdq_ifsubr.c
+++ b/sys/dev/pdq/pdq_ifsubr.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pdq_ifsubr.c,v 1.7 1998/02/20 13:11:45 bde Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/pdq/pdqreg.h b/sys/dev/pdq/pdqreg.h
index 6c4d51a1dfadc..f3cfa84fdcb59 100644
--- a/sys/dev/pdq/pdqreg.h
+++ b/sys/dev/pdq/pdqreg.h
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pdqreg.h,v 1.9 1996/05/16 14:25:26 thomas Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/pdq/pdqvar.h b/sys/dev/pdq/pdqvar.h
index 5587d188931e7..8320eaec69f9d 100644
--- a/sys/dev/pdq/pdqvar.h
+++ b/sys/dev/pdq/pdqvar.h
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pdqvar.h,v 1.1.1.1 1997/01/17 23:19:49 joerg Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
index 6d60a78196f60..e82f49f23858b 100644
--- a/sys/dev/ppbus/if_plip.c
+++ b/sys/dev/ppbus/if_plip.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp
- *	$Id: if_plip.c,v 1.12 1999/02/14 16:19:16 nsouch Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ppbus/immio.c b/sys/dev/ppbus/immio.c
index 50b9c06a707e3..a744dc86651e3 100644
--- a/sys/dev/ppbus/immio.c
+++ b/sys/dev/ppbus/immio.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: immio.c,v 1.6 1999/01/30 15:35:39 nsouch Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/ppbus/lpbb.c b/sys/dev/ppbus/lpbb.c
index 08f4540458217..bf2880798ebe4 100644
--- a/sys/dev/ppbus/lpbb.c
+++ b/sys/dev/ppbus/lpbb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: lpbb.c,v 1.5 1999/05/08 21:59:06 dfr Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c
index 956c6a7c8d6fd..56312b4002aca 100644
--- a/sys/dev/ppbus/lpt.c
+++ b/sys/dev/ppbus/lpt.c
@@ -48,7 +48,7 @@
  *	from: unknown origin, 386BSD 0.1
  *	From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp
  *	From Id: nlpt.c,v 1.14 1999/02/08 13:55:43 des Exp
- *	$Id: lpt.c,v 1.6 1999/06/03 22:03:35 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ppbus/lpt.h b/sys/dev/ppbus/lpt.h
index 3ca268d081feb..9075b4ec6e5ad 100644
--- a/sys/dev/ppbus/lpt.h
+++ b/sys/dev/ppbus/lpt.h
@@ -34,7 +34,7 @@
  *	Id: lptreg.h,v 1.6 1997/02/22 09:36:52 peter Exp 
  *	From Id: nlpt.h,v 1.3 1999/01/10 12:04:54 nsouch Exp
  *
- *	$Id: lpt.h,v 1.2 1999/02/14 16:19:16 nsouch Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ppbus/lptio.h b/sys/dev/ppbus/lptio.h
index 2d70d7ee33976..56d196a62fef1 100644
--- a/sys/dev/ppbus/lptio.h
+++ b/sys/dev/ppbus/lptio.h
@@ -11,7 +11,7 @@
  *
  *	Geoff Rehmet, Rhodes University, South Africa <csgr@cs.ru.ac.za>
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_MACHINE_LPT_H_
diff --git a/sys/dev/ppbus/ppb_1284.c b/sys/dev/ppbus/ppb_1284.c
index 5da5fa3eac3ad..30221747dddfd 100644
--- a/sys/dev/ppbus/ppb_1284.c
+++ b/sys/dev/ppbus/ppb_1284.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppb_1284.c,v 1.7 1999/01/10 12:04:54 nsouch Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/ppbus/ppb_1284.h b/sys/dev/ppbus/ppb_1284.h
index ea009b7d381dd..f975c26e24758 100644
--- a/sys/dev/ppbus/ppb_1284.h
+++ b/sys/dev/ppbus/ppb_1284.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppb_1284.h,v 1.3 1998/09/13 18:26:26 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __1284_H
diff --git a/sys/dev/ppbus/ppb_base.c b/sys/dev/ppbus/ppb_base.c
index fed87304e182c..250999be814ff 100644
--- a/sys/dev/ppbus/ppb_base.c
+++ b/sys/dev/ppbus/ppb_base.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppb_base.c,v 1.7 1999/01/27 20:09:19 dillon Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/ppbus/ppb_msq.c b/sys/dev/ppbus/ppb_msq.c
index e0893e702f19b..d5b729a184769 100644
--- a/sys/dev/ppbus/ppb_msq.c
+++ b/sys/dev/ppbus/ppb_msq.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppb_msq.c,v 1.4 1999/01/10 12:04:54 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #include <machine/stdarg.h>
diff --git a/sys/dev/ppbus/ppb_msq.h b/sys/dev/ppbus/ppb_msq.h
index 3ddf434c657a5..25b55fd798b9c 100644
--- a/sys/dev/ppbus/ppb_msq.h
+++ b/sys/dev/ppbus/ppb_msq.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppb_msq.h,v 1.5 1999/01/30 15:35:39 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __PPB_MSQ_H
diff --git a/sys/dev/ppbus/ppbconf.c b/sys/dev/ppbus/ppbconf.c
index a11260ec5c247..f98fcf27aad13 100644
--- a/sys/dev/ppbus/ppbconf.c
+++ b/sys/dev/ppbus/ppbconf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppbconf.c,v 1.13 1999/01/14 06:22:02 jdp Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/ppbus/ppbconf.h b/sys/dev/ppbus/ppbconf.h
index 62bd99cea7ce0..4160f0ca2e91b 100644
--- a/sys/dev/ppbus/ppbconf.h
+++ b/sys/dev/ppbus/ppbconf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppbconf.h,v 1.14 1999/04/05 15:43:11 peter Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __PPBCONF_H
diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c
index e19be8c3a91b1..0d8c97006a7ff 100644
--- a/sys/dev/ppbus/ppi.c
+++ b/sys/dev/ppbus/ppi.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppi.c,v 1.14 1999/05/30 16:51:35 phk Exp $
+ * $FreeBSD$
  *
  */
 #include "ppi.h"
diff --git a/sys/dev/ppbus/ppi.h b/sys/dev/ppbus/ppi.h
index 243c87fa63c7d..7d854e3bfb7f3 100644
--- a/sys/dev/ppbus/ppi.h
+++ b/sys/dev/ppbus/ppi.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppi.h,v 1.2 1998/01/02 09:30:39 msmith Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __PPI_H
diff --git a/sys/dev/ppbus/pps.c b/sys/dev/ppbus/pps.c
index 5279f113e8b9d..14204b18e0856 100644
--- a/sys/dev/ppbus/pps.c
+++ b/sys/dev/ppbus/pps.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: pps.c,v 1.19 1999/05/31 11:25:00 phk Exp $
+ * $FreeBSD$
  *
  * This driver implements a draft-mogul-pps-api-02.txt PPS source.
  *
diff --git a/sys/dev/ppbus/vpo.c b/sys/dev/ppbus/vpo.c
index 11b5530f68e4e..f589ecfee36a8 100644
--- a/sys/dev/ppbus/vpo.c
+++ b/sys/dev/ppbus/vpo.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: vpo.c,v 1.14 1999/05/06 21:14:49 ken Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/ppbus/vpoio.c b/sys/dev/ppbus/vpoio.c
index 4b9ff52fba318..b1582293d8252 100644
--- a/sys/dev/ppbus/vpoio.c
+++ b/sys/dev/ppbus/vpoio.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: vpoio.c,v 1.6 1999/01/30 15:35:39 nsouch Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/ppbus/vpoio.h b/sys/dev/ppbus/vpoio.h
index 1bd7d11adb1f7..e007d3e8e4228 100644
--- a/sys/dev/ppbus/vpoio.h
+++ b/sys/dev/ppbus/vpoio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: vpoio.h,v 1.1.2.2 1998/06/14 14:37:43 son Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __VP0IO_H
diff --git a/sys/dev/ppc/ppc.c b/sys/dev/ppc/ppc.c
index 073eab558d8fe..436caebf84a21 100644
--- a/sys/dev/ppc/ppc.c
+++ b/sys/dev/ppc/ppc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppc.c,v 1.20 1999/02/14 22:02:47 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #include "ppc.h"
diff --git a/sys/dev/ppc/ppcreg.h b/sys/dev/ppc/ppcreg.h
index 3a61ae7675a95..faecb9771ff85 100644
--- a/sys/dev/ppc/ppcreg.h
+++ b/sys/dev/ppc/ppcreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppcreg.h,v 1.7 1999/01/10 16:41:13 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __PPCREG_H
diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c
index b16f6e4f9131f..a3a4db2be574d 100644
--- a/sys/dev/rp/rp.c
+++ b/sys/dev/rp/rp.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: rp.c,v 1.28 1999/05/31 11:26:24 phk Exp $
+ * $FreeBSD$
  */
 
 /* 
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index a9e39f13fdc20..5ec3eadead222 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.47 1999/05/31 11:26:26 phk Exp $ */
+/* $FreeBSD$ */
 
 /* Please send any comments to micke@dynas.se */
 
diff --git a/sys/dev/scd/scdreg.h b/sys/dev/scd/scdreg.h
index d04dc6919e2e0..e9ce3b15a23f9 100644
--- a/sys/dev/scd/scdreg.h
+++ b/sys/dev/scd/scdreg.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c
index e4de7e6956dbb..9a79c26352913 100644
--- a/sys/dev/sf/if_sf.c
+++ b/sys/dev/sf/if_sf.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_sf.c,v 1.12 1999/07/25 05:10:18 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -119,7 +119,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_sf.c,v 1.12 1999/07/25 05:10:18 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 static struct sf_type sf_devs[] = {
diff --git a/sys/dev/sf/if_sfreg.h b/sys/dev/sf/if_sfreg.h
index 4ead87013a320..e5149aef95b24 100644
--- a/sys/dev/sf/if_sfreg.h
+++ b/sys/dev/sf/if_sfreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_sfreg.h,v 1.4 1999/07/21 03:44:25 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index 34b19d4674950..4186f4be232b5 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.c,v 1.90 1999/08/27 06:53:34 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/sys/dev/si/si.h b/sys/dev/si/si.h
index 416486c039b01..29d709bb32848 100644
--- a/sys/dev/si/si.h
+++ b/sys/dev/si/si.h
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.h,v 1.12 1998/03/23 16:27:43 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/callout.h>
diff --git a/sys/dev/si/sireg.h b/sys/dev/si/sireg.h
index 4697a7fe236d5..711bf92e7ea07 100644
--- a/sys/dev/si/sireg.h
+++ b/sys/dev/si/sireg.h
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: sireg.h,v 1.6 1998/03/23 16:27:40 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 7a8c247fe2a89..962074416053a 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sio.c,v 1.255 1999/08/09 11:02:38 phk Exp $
+ * $FreeBSD$
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.234
  */
diff --git a/sys/dev/sio/sioreg.h b/sys/dev/sio/sioreg.h
index cb7aa5fbd1980..0521065259982 100644
--- a/sys/dev/sio/sioreg.h
+++ b/sys/dev/sio/sioreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)comreg.h	7.2 (Berkeley) 5/9/91
- *	$Id: sioreg.h,v 1.11 1998/09/26 14:00:29 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c
index aee546f554bb7..4038967091a8c 100644
--- a/sys/dev/sk/if_sk.c
+++ b/sys/dev/sk/if_sk.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_sk.c,v 1.51 1999/07/14 21:48:19 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -102,7 +102,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_sk.c,v 1.51 1999/07/14 21:48:19 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 static struct sk_type sk_devs[] = {
diff --git a/sys/dev/sk/if_skreg.h b/sys/dev/sk/if_skreg.h
index f03aeff36705f..b0eaa90fce6cd 100644
--- a/sys/dev/sk/if_skreg.h
+++ b/sys/dev/sk/if_skreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_skreg.h,v 1.5 1999/07/23 02:06:56 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/sk/xmaciireg.h b/sys/dev/sk/xmaciireg.h
index fe8946bdabdb8..f649e93a044e8 100644
--- a/sys/dev/sk/xmaciireg.h
+++ b/sys/dev/sk/xmaciireg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: xmaciireg.h,v 1.10 1999/07/09 03:35:12 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/smbus/smb.c b/sys/dev/smbus/smb.c
index 06e5246552ef4..b08943569a55a 100644
--- a/sys/dev/smbus/smb.c
+++ b/sys/dev/smbus/smb.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: smb.c,v 1.14 1999/07/04 14:58:21 phk Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/smbus/smb.h b/sys/dev/smbus/smb.h
index e0ebef8b2dd4c..7ed0a82f58fad 100644
--- a/sys/dev/smbus/smb.h
+++ b/sys/dev/smbus/smb.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: smb.h,v 1.1 1998/09/03 21:00:08 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __SMB_H
diff --git a/sys/dev/smbus/smbconf.c b/sys/dev/smbus/smbconf.c
index 59c105c325c7d..d97305c1c553b 100644
--- a/sys/dev/smbus/smbconf.c
+++ b/sys/dev/smbus/smbconf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: smbconf.c,v 1.5 1999/02/13 17:57:19 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/smbus/smbconf.h b/sys/dev/smbus/smbconf.h
index c260de4f86252..40289f76a5521 100644
--- a/sys/dev/smbus/smbconf.h
+++ b/sys/dev/smbus/smbconf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: smbconf.h,v 1.4 1999/02/13 17:57:19 nsouch Exp $
+ * $FreeBSD$
  */
 #ifndef __SMBONF_H
 #define __SMBONF_H
diff --git a/sys/dev/smbus/smbus.c b/sys/dev/smbus/smbus.c
index 2f2632ed3fc93..1107992f467b1 100644
--- a/sys/dev/smbus/smbus.c
+++ b/sys/dev/smbus/smbus.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: smbus.c,v 1.9 1999/05/08 21:59:08 dfr Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/param.h>
diff --git a/sys/dev/smbus/smbus.h b/sys/dev/smbus/smbus.h
index c89cde1856d92..9f96b9dfe1729 100644
--- a/sys/dev/smbus/smbus.h
+++ b/sys/dev/smbus/smbus.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: smbus.h,v 1.1.1.1 1998/08/10 18:26:05 son Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __SMBUS_H
diff --git a/sys/dev/smbus/smbus_if.m b/sys/dev/smbus/smbus_if.m
index 3e118811b5b06..d520c2b357098 100644
--- a/sys/dev/smbus/smbus_if.m
+++ b/sys/dev/smbus/smbus_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id: smbus_if.m,v 1.3 1998/11/07 14:56:04 nsouch Exp $
+# $FreeBSD$
 #
 
 INTERFACE smbus;
diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c
index 0e7bf1afd7a8a..7563686558842 100644
--- a/sys/dev/snp/snp.c
+++ b/sys/dev/snp/snp.c
@@ -12,7 +12,7 @@
  *
  * Snoop stuff.
  *
- *	$Id: tty_snoop.c,v 1.40 1999/06/17 23:42:44 gpalmer Exp $
+ * $FreeBSD$
  */
 
 #include "snp.h"
diff --git a/sys/dev/speaker/speaker.h b/sys/dev/speaker/speaker.h
index 0d204bfe2f076..78b55b6135e33 100644
--- a/sys/dev/speaker/speaker.h
+++ b/sys/dev/speaker/speaker.h
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  *      modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_MACHINE_SPEAKER_H_
diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c
index 29f82055c98ac..39d50c4c923ac 100644
--- a/sys/dev/speaker/spkr.c
+++ b/sys/dev/speaker/spkr.c
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- *    $Id: spkr.c,v 1.39 1999/08/23 20:35:17 bde Exp $
+ * $FreeBSD$
  */
 
 #include "speaker.h"
diff --git a/sys/dev/sr/if_sr.c b/sys/dev/sr/if_sr.c
index ba883f7fecc9d..6d56ab42712f7 100644
--- a/sys/dev/sr/if_sr.c
+++ b/sys/dev/sr/if_sr.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.23 1999/05/06 22:14:46 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c
index ba883f7fecc9d..6d56ab42712f7 100644
--- a/sys/dev/sr/if_sr_isa.c
+++ b/sys/dev/sr/if_sr_isa.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.23 1999/05/06 22:14:46 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/sr/if_sr_pci.c b/sys/dev/sr/if_sr_pci.c
index 260f5ef0c5d0a..04d0db82c418f 100644
--- a/sys/dev/sr/if_sr_pci.c
+++ b/sys/dev/sr/if_sr_pci.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr_p.c,v 1.9 1999/05/09 17:06:59 peter Exp $
+ * $FreeBSD$
  */
 
 #include "sr.h"
diff --git a/sys/dev/sr/if_srregs.h b/sys/dev/sr/if_srregs.h
index 689b6abecf2dc..64d9ba11c50e4 100644
--- a/sys/dev/sr/if_srregs.h
+++ b/sys/dev/sr/if_srregs.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifndef _IF_SRREGS_H_
 #define _IF_SRREGS_H_
diff --git a/sys/dev/streams/streams.c b/sys/dev/streams/streams.c
index 685d724fb5cda..f8e134851ab3a 100644
--- a/sys/dev/streams/streams.c
+++ b/sys/dev/streams/streams.c
@@ -30,7 +30,7 @@
  * skeleton produced from /usr/share/examples/drivers/make_pseudo_driver.sh
  * in 3.0-980524-SNAP then hacked a bit (but probably not enough :-).
  *
- * $Id: streams.c,v 1.9 1999/08/04 18:53:37 green Exp $
+ * $FreeBSD$
  */
 
 #include "streams.h"		/* generated file.. defines NSTREAMS */
diff --git a/sys/dev/syscons/blank/blank_saver.c b/sys/dev/syscons/blank/blank_saver.c
index 2979c0da94423..960acca5a5122 100644
--- a/sys/dev/syscons/blank/blank_saver.c
+++ b/sys/dev/syscons/blank/blank_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: blank_saver.c,v 1.15 1999/01/11 03:18:44 yokota Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/daemon/daemon_saver.c b/sys/dev/syscons/daemon/daemon_saver.c
index ebedfaa2e8c03..bc03f6446401b 100644
--- a/sys/dev/syscons/daemon/daemon_saver.c
+++ b/sys/dev/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.15 1999/02/05 12:40:15 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/fade/fade_saver.c b/sys/dev/syscons/fade/fade_saver.c
index 4a44c8519bcc5..052fa92259080 100644
--- a/sys/dev/syscons/fade/fade_saver.c
+++ b/sys/dev/syscons/fade/fade_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: fade_saver.c,v 1.16 1999/01/11 03:18:46 yokota Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/fire/fire_saver.c b/sys/dev/syscons/fire/fire_saver.c
index db4b80b1a7b06..59c7079161607 100644
--- a/sys/dev/syscons/fire/fire_saver.c
+++ b/sys/dev/syscons/fire/fire_saver.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: fire_saver.c,v 1.4 1999/05/10 15:25:50 des Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/syscons/green/green_saver.c b/sys/dev/syscons/green/green_saver.c
index 103154be7a8db..d6cfe80da6897 100644
--- a/sys/dev/syscons/green/green_saver.c
+++ b/sys/dev/syscons/green/green_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: green_saver.c,v 1.15 1999/01/11 03:18:48 yokota Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/logo/logo_saver.c b/sys/dev/syscons/logo/logo_saver.c
index 24da9644a17fa..2d2c660847ac4 100644
--- a/sys/dev/syscons/logo/logo_saver.c
+++ b/sys/dev/syscons/logo/logo_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: logo_saver.c,v 1.6 1999/04/12 13:34:57 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/rain/rain_saver.c b/sys/dev/syscons/rain/rain_saver.c
index 200dc59931f0a..6d2ed39e46545 100644
--- a/sys/dev/syscons/rain/rain_saver.c
+++ b/sys/dev/syscons/rain/rain_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: rain_saver.c,v 1.3 1999/04/12 13:34:57 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/scgfbrndr.c b/sys/dev/syscons/scgfbrndr.c
index 16c40e26e566c..8a1cdaa87035c 100644
--- a/sys/dev/syscons/scgfbrndr.c
+++ b/sys/dev/syscons/scgfbrndr.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id:$
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/dev/syscons/schistory.c b/sys/dev/syscons/schistory.c
index 433182d32a01a..cf9585b77a5aa 100644
--- a/sys/dev/syscons/schistory.c
+++ b/sys/dev/syscons/schistory.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: schistory.c,v 1.1 1999/06/22 14:13:26 yokota Exp $
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/dev/syscons/scmouse.c b/sys/dev/syscons/scmouse.c
index 8d8dc6775b8c8..cc5f328de290d 100644
--- a/sys/dev/syscons/scmouse.c
+++ b/sys/dev/syscons/scmouse.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id:$
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/dev/syscons/scvesactl.c b/sys/dev/syscons/scvesactl.c
index 114c5ecbf053e..c8333d50c8d8d 100644
--- a/sys/dev/syscons/scvesactl.c
+++ b/sys/dev/syscons/scvesactl.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: scvesactl.c,v 1.10 1999/06/01 18:17:31 jlemon Exp $
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/dev/syscons/scvgarndr.c b/sys/dev/syscons/scvgarndr.c
index 16c40e26e566c..8a1cdaa87035c 100644
--- a/sys/dev/syscons/scvgarndr.c
+++ b/sys/dev/syscons/scvgarndr.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id:$
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c
index 1187657b58eae..d01e34c5d6b1f 100644
--- a/sys/dev/syscons/scvidctl.c
+++ b/sys/dev/syscons/scvidctl.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: scvidctl.c,v 1.10 1999/07/07 13:48:49 yokota Exp $
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/dev/syscons/scvtb.c b/sys/dev/syscons/scvtb.c
index 3c62ec9e4d10b..eebeb23182deb 100644
--- a/sys/dev/syscons/scvtb.c
+++ b/sys/dev/syscons/scvtb.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: scvtb.c,v 1.1 1999/06/22 14:13:30 yokota Exp $
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/dev/syscons/snake/snake_saver.c b/sys/dev/syscons/snake/snake_saver.c
index 51e1746f5f9d7..093e564bef135 100644
--- a/sys/dev/syscons/snake/snake_saver.c
+++ b/sys/dev/syscons/snake/snake_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.23 1999/02/05 12:40:15 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/star/star_saver.c b/sys/dev/syscons/star/star_saver.c
index 56408dc78ceef..645e4fd3c354f 100644
--- a/sys/dev/syscons/star/star_saver.c
+++ b/sys/dev/syscons/star/star_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.20 1999/02/05 12:40:16 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 8fcaaa4ebae69..cb6202f57fac4 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscons.c,v 1.318 1999/08/17 22:06:17 billf Exp $
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h
index 57f19a56b2e8d..01d82a069fd44 100644
--- a/sys/dev/syscons/syscons.h
+++ b/sys/dev/syscons/syscons.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: syscons.h,v 1.51 1999/08/20 20:25:00 julian Exp $
+ * $FreeBSD$
  */
 
 #ifndef _DEV_SYSCONS_SYSCONS_H_
diff --git a/sys/dev/syscons/warp/warp_saver.c b/sys/dev/syscons/warp/warp_saver.c
index cd6f42b3358bb..7e5140720713b 100644
--- a/sys/dev/syscons/warp/warp_saver.c
+++ b/sys/dev/syscons/warp/warp_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: warp_saver.c,v 1.5 1999/04/12 13:34:58 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index c83deefacdd53..5195324852b46 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_ti.c,v 1.14 1999/07/27 13:54:15 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -131,7 +131,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_ti.c,v 1.14 1999/07/27 13:54:15 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/dev/ti/if_tireg.h b/sys/dev/ti/if_tireg.h
index 09b198230eba2..36bbaddff5ad0 100644
--- a/sys/dev/ti/if_tireg.h
+++ b/sys/dev/ti/if_tireg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_tireg.h,v 1.8 1999/07/23 18:46:24 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/ti/ti_fw.h b/sys/dev/ti/ti_fw.h
index 51bc01498ad7d..8d4ae4dd1ea78 100644
--- a/sys/dev/ti/ti_fw.h
+++ b/sys/dev/ti/ti_fw.h
@@ -2,7 +2,7 @@
  * Firmware for Alteon Tigon 1 chip.
  * Generated by genfw.c
  *
- *      $Id$
+ * $FreeBSD$
  */
 static int tigonFwReleaseMajor = 0xc;
 static int tigonFwReleaseMinor = 0x3;
diff --git a/sys/dev/ti/ti_fw2.h b/sys/dev/ti/ti_fw2.h
index e2ee31f7e4c93..e46ac9640143c 100644
--- a/sys/dev/ti/ti_fw2.h
+++ b/sys/dev/ti/ti_fw2.h
@@ -3,7 +3,7 @@
  * Built on Thu Jul 15 17:08:34 1999 by wpaul@xylophone
  * OS: FreeBSD 3.2-RELEASE
  *
- *	$Id: genfw.c,v 1.2 1999/03/18 17:16:43 wpaul Exp $
+ * $FreeBSD$
  */
 static int tigon2FwReleaseMajor = 0xc;
 static int tigon2FwReleaseMinor = 0x3;
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c
index b7cdc5d3c4c99..6830e10690c7b 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $	*/
-/*	$Id: if_tx.c,v 1.30 1999/08/21 06:24:35 msmith Exp $ */
+/* $FreeBSD$ */
 
 /*-
  * Copyright (c) 1997 Semen Ustimenko (semen@iclub.nsu.ru)
diff --git a/sys/dev/tx/if_txreg.h b/sys/dev/tx/if_txreg.h
index 5d0d89570d7d2..5efe056267f15 100644
--- a/sys/dev/tx/if_txreg.h
+++ b/sys/dev/tx/if_txreg.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_txvar.h,v 1.3 1998/10/10 04:30:09 jason Exp $	*/
-/*      $Id: if_txvar.h,v 1.2 1999/03/14 08:30:23 semenu Exp $ */
+/* $FreeBSD$ */
 
 /*-
  * Copyright (c) 1997 Semen Ustimenko
diff --git a/sys/dev/tx/if_txvar.h b/sys/dev/tx/if_txvar.h
index 5d0d89570d7d2..5efe056267f15 100644
--- a/sys/dev/tx/if_txvar.h
+++ b/sys/dev/tx/if_txvar.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_txvar.h,v 1.3 1998/10/10 04:30:09 jason Exp $	*/
-/*      $Id: if_txvar.h,v 1.2 1999/03/14 08:30:23 semenu Exp $ */
+/* $FreeBSD$ */
 
 /*-
  * Copyright (c) 1997 Semen Ustimenko
diff --git a/sys/dev/vinum/COPYRIGHT b/sys/dev/vinum/COPYRIGHT
index ed43ff1f54ebb..f0295e6a6d0e2 100644
--- a/sys/dev/vinum/COPYRIGHT
+++ b/sys/dev/vinum/COPYRIGHT
@@ -33,5 +33,5 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: COPYRIGHT,v 1.1.1.1 1998/09/16 05:56:21 grog Exp $
+ * $FreeBSD$
  */
diff --git a/sys/dev/vinum/makestatetext b/sys/dev/vinum/makestatetext
index 02a927e4e3080..3cb709c6b4602 100755
--- a/sys/dev/vinum/makestatetext
+++ b/sys/dev/vinum/makestatetext
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Make statetexts.h from vinumstate.h
-# $Id: makestatetext,v 1.5 1999/01/15 07:30:45 grog Exp grog $
+# $FreeBSD$
 infile=vinumstate.h
 ofile=statetexts.h
 cat > $ofile <<FOO
diff --git a/sys/dev/vinum/request.h b/sys/dev/vinum/request.h
index 5788c21c3877a..143cbea66fc71 100644
--- a/sys/dev/vinum/request.h
+++ b/sys/dev/vinum/request.h
@@ -33,7 +33,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: request.h,v 1.15 1999/07/05 02:39:00 grog Exp grog $
+ * $FreeBSD$
  */
 
 /* Information needed to set up a transfer */
diff --git a/sys/dev/vinum/vinum.c b/sys/dev/vinum/vinum.c
index f584af830fb05..7149ee862af23 100644
--- a/sys/dev/vinum/vinum.c
+++ b/sys/dev/vinum/vinum.c
@@ -35,7 +35,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinum.c,v 1.25 1999/06/25 07:54:48 grog Exp grog $
+ * $FreeBSD$
  */
 
 #define STATIC static					    /* nothing while we're testing XXX */
diff --git a/sys/dev/vinum/vinumconfig.c b/sys/dev/vinum/vinumconfig.c
index 0fc1e1ed885a7..2fbf557440e34 100644
--- a/sys/dev/vinum/vinumconfig.c
+++ b/sys/dev/vinum/vinumconfig.c
@@ -45,7 +45,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumconfig.c,v 1.26 1999/06/23 01:53:24 grog Exp grog $
+ * $FreeBSD$
  */
 
 #define STATIC static
diff --git a/sys/dev/vinum/vinumdaemon.c b/sys/dev/vinum/vinumdaemon.c
index 03528a92b95d5..8f39f7da9f138 100644
--- a/sys/dev/vinum/vinumdaemon.c
+++ b/sys/dev/vinum/vinumdaemon.c
@@ -34,7 +34,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumdaemon.c,v 1.5 1999/06/23 03:22:01 grog Exp grog $
+ * $FreeBSD$
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumext.h b/sys/dev/vinum/vinumext.h
index c8166541c084b..5745e2bcf46d2 100644
--- a/sys/dev/vinum/vinumext.h
+++ b/sys/dev/vinum/vinumext.h
@@ -33,7 +33,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumext.h,v 1.20 1999/06/23 01:53:37 grog Exp grog $
+ * $FreeBSD$
  */
 
 /* vinumext.h: external definitions */
diff --git a/sys/dev/vinum/vinumhdr.h b/sys/dev/vinum/vinumhdr.h
index 1baa60b6f1744..22b62d6040c07 100644
--- a/sys/dev/vinum/vinumhdr.h
+++ b/sys/dev/vinum/vinumhdr.h
@@ -35,7 +35,7 @@
  */
 
 /* Header files used by all modules */
-/* $Id: vinumhdr.h,v 1.12 1999/01/28 08:58:33 grog Exp grog $ */
+/* $FreeBSD$ */
 
 #include <sys/param.h>
 #ifdef KERNEL
diff --git a/sys/dev/vinum/vinuminterrupt.c b/sys/dev/vinum/vinuminterrupt.c
index 448dad2052c1c..5fa77868f8693 100644
--- a/sys/dev/vinum/vinuminterrupt.c
+++ b/sys/dev/vinum/vinuminterrupt.c
@@ -39,7 +39,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinuminterrupt.c,v 1.6 1999/06/18 00:50:53 grog Exp grog $
+ * $FreeBSD$
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumio.c b/sys/dev/vinum/vinumio.c
index d49eb3ac1008d..6cf3f0a239887 100644
--- a/sys/dev/vinum/vinumio.c
+++ b/sys/dev/vinum/vinumio.c
@@ -33,7 +33,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumio.c,v 1.25 1999/06/28 02:37:48 grog Exp grog $
+ * $FreeBSD$
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumio.h b/sys/dev/vinum/vinumio.h
index a7c43d3989afe..cecd3f6c02d1b 100644
--- a/sys/dev/vinum/vinumio.h
+++ b/sys/dev/vinum/vinumio.h
@@ -33,7 +33,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumio.h,v 1.16 1999/03/29 08:43:19 grog Exp grog $
+ * $FreeBSD$
  */
 
 #ifdef VINUMDEBUG
diff --git a/sys/dev/vinum/vinumioctl.c b/sys/dev/vinum/vinumioctl.c
index 5eaa697948cd1..27b2d96eef702 100644
--- a/sys/dev/vinum/vinumioctl.c
+++ b/sys/dev/vinum/vinumioctl.c
@@ -41,7 +41,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumioctl.c,v 1.9 1999/07/03 04:59:57 grog Exp grog $
+ * $FreeBSD$
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumkw.h b/sys/dev/vinum/vinumkw.h
index 31293bcaa98b8..4d33c24028fa6 100644
--- a/sys/dev/vinum/vinumkw.h
+++ b/sys/dev/vinum/vinumkw.h
@@ -33,7 +33,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumkw.h,v 1.13 1999/07/02 03:46:32 grog Exp grog $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/vinum/vinumlock.c b/sys/dev/vinum/vinumlock.c
index 8bc13207c13e4..c7bf3dbad931c 100644
--- a/sys/dev/vinum/vinumlock.c
+++ b/sys/dev/vinum/vinumlock.c
@@ -37,7 +37,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumlock.c,v 1.10 1999/05/15 03:47:45 grog Exp grog $
+ * $FreeBSD$
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinummemory.c b/sys/dev/vinum/vinummemory.c
index 27f6f8be0306c..e13d7249dd849 100644
--- a/sys/dev/vinum/vinummemory.c
+++ b/sys/dev/vinum/vinummemory.c
@@ -33,7 +33,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinummemory.c,v 1.20 1999/03/19 03:21:08 grog Exp grog $
+ * $FreeBSD$
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumparser.c b/sys/dev/vinum/vinumparser.c
index 5cff5fee2428e..48ec43bc2ae9a 100644
--- a/sys/dev/vinum/vinumparser.c
+++ b/sys/dev/vinum/vinumparser.c
@@ -33,7 +33,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumparser.c,v 1.16 1999/06/29 09:04:28 grog Exp grog $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/vinum/vinumraid5.c b/sys/dev/vinum/vinumraid5.c
index aa5427569054c..b1be512e34c0f 100644
--- a/sys/dev/vinum/vinumraid5.c
+++ b/sys/dev/vinum/vinumraid5.c
@@ -38,7 +38,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: raid5.c,v 1.15 1999/07/07 03:46:01 grog Exp grog $
+ * $FreeBSD$
  */
 #include <dev/vinum/vinumhdr.h>
 #include <dev/vinum/request.h>
diff --git a/sys/dev/vinum/vinumrequest.c b/sys/dev/vinum/vinumrequest.c
index f788752a35393..2b7eae6a60518 100644
--- a/sys/dev/vinum/vinumrequest.c
+++ b/sys/dev/vinum/vinumrequest.c
@@ -37,7 +37,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumrequest.c,v 1.24 1999/07/05 01:53:14 grog Exp grog $
+ * $FreeBSD$
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumrevive.c b/sys/dev/vinum/vinumrevive.c
index a701ae3c05dc0..534976624cb5e 100644
--- a/sys/dev/vinum/vinumrevive.c
+++ b/sys/dev/vinum/vinumrevive.c
@@ -37,7 +37,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumrevive.c,v 1.8 1999/06/28 01:57:50 grog Exp grog $
+ * $FreeBSD$
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumstate.c b/sys/dev/vinum/vinumstate.c
index b6e15baf91320..2e52f6c4e51dd 100644
--- a/sys/dev/vinum/vinumstate.c
+++ b/sys/dev/vinum/vinumstate.c
@@ -37,7 +37,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumstate.c,v 2.12 1999/07/05 01:36:48 grog Exp grog $
+ * $FreeBSD$
  */
 
 #include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumstate.h b/sys/dev/vinum/vinumstate.h
index 38efa3122d5b8..572f317d03dca 100644
--- a/sys/dev/vinum/vinumstate.h
+++ b/sys/dev/vinum/vinumstate.h
@@ -33,7 +33,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumstate.h,v 1.14 1999/03/25 02:17:38 grog Exp grog $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/vinum/vinumutil.c b/sys/dev/vinum/vinumutil.c
index fee35550fa34b..45b8bde65f1ab 100644
--- a/sys/dev/vinum/vinumutil.c
+++ b/sys/dev/vinum/vinumutil.c
@@ -35,7 +35,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumutil.c,v 1.12 1999/05/15 04:44:24 grog Exp grog $
+ * $FreeBSD$
  */
 
 /* This file contains utility routines used both in kernel and user context */
diff --git a/sys/dev/vinum/vinumvar.h b/sys/dev/vinum/vinumvar.h
index f844010742a93..a37c9e82d6970 100644
--- a/sys/dev/vinum/vinumvar.h
+++ b/sys/dev/vinum/vinumvar.h
@@ -37,7 +37,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumvar.h,v 1.20 1999/07/02 05:24:52 grog Exp grog $
+ * $FreeBSD$
  */
 
 #include <sys/time.h>
diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c
index af68ae56aab77..8254f873620d8 100644
--- a/sys/dev/vn/vn.c
+++ b/sys/dev/vn/vn.c
@@ -38,7 +38,7 @@
  * from: Utah Hdr: vn.c 1.13 94/04/02
  *
  *	from: @(#)vn.c	8.6 (Berkeley) 4/1/94
- *	$Id: vn.c,v 1.85 1999/08/23 09:35:12 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index 2f91c23b2505f..cae329a5761de 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_vr.c,v 1.14 1999/08/10 17:15:10 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -100,7 +100,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_vr.c,v 1.14 1999/08/10 17:15:10 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/dev/vr/if_vrreg.h b/sys/dev/vr/if_vrreg.h
index e1e4ae6d1cfc7..fef8e48fc3908 100644
--- a/sys/dev/vr/if_vrreg.h
+++ b/sys/dev/vr/if_vrreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_vrreg.h,v 1.4 1999/05/06 15:32:50 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index 62cd9ebd4d903..a67cff8f4e613 100644
--- a/sys/dev/vx/if_vx.c
+++ b/sys/dev/vx/if_vx.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_vx.c,v 1.20 1999/01/27 20:09:20 dillon Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/dev/wi/if_wavelan_ieee.h b/sys/dev/wi/if_wavelan_ieee.h
index f002933a9bdc5..ef5f5ae709ccc 100644
--- a/sys/dev/wi/if_wavelan_ieee.h
+++ b/sys/dev/wi/if_wavelan_ieee.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_wavelan_ieee.h,v 1.4 1999/04/27 02:02:41 wpaul Exp $
+ * $FreeBSD$
  */
 
 #ifndef _IF_WAVELAN_IEEE_H
diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c
index 0a92e80924637..73e56d7295b63 100644
--- a/sys/dev/wi/if_wi.c
+++ b/sys/dev/wi/if_wi.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_wi.c,v 1.9 1999/08/21 06:24:15 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -117,7 +117,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_wi.c,v 1.9 1999/08/21 06:24:15 msmith Exp $";
+  "$FreeBSD$";
 #endif
 
 static struct wi_softc wi_softc[NWI];
diff --git a/sys/dev/wi/if_wireg.h b/sys/dev/wi/if_wireg.h
index 75c963ea4686f..d4173273f5249 100644
--- a/sys/dev/wi/if_wireg.h
+++ b/sys/dev/wi/if_wireg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_wireg.h,v 1.4 1999/05/07 03:28:52 wpaul Exp $
+ * $FreeBSD$
  */
 
 struct wi_counters {
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index 2c37caf847740..2a68f775e6775 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -1,4 +1,4 @@
-/* $Id: if_wl.c,v 1.23 1999/08/18 06:11:59 mdodd Exp $ */
+/* $FreeBSD$ */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c
index 4d67a35a54dc0..d8351f09f730e 100644
--- a/sys/dev/xe/if_xe.c
+++ b/sys/dev/xe/if_xe.c
@@ -23,8 +23,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_xe.c,v 1.20 1999/06/13 19:17:40 scott Exp $
- *	$FreeBSD$
+ * $FreeBSD$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/dev/xe/if_xereg.h b/sys/dev/xe/if_xereg.h
index a4ecb35da19c7..9eb7d3138288d 100644
--- a/sys/dev/xe/if_xereg.h
+++ b/sys/dev/xe/if_xereg.h
@@ -23,8 +23,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_xereg.h,v 1.5 1999/05/20 21:53:58 scott Exp $
- *	$FreeBSD$
+ * $FreeBSD$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/cd9660/TODO b/sys/fs/cd9660/TODO
index cf3fadc5d8829..b8d7f3efebb99 100644
--- a/sys/fs/cd9660/TODO
+++ b/sys/fs/cd9660/TODO
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
  2) should understand Rock Ridge
 
diff --git a/sys/fs/cd9660/cd9660_bmap.c b/sys/fs/cd9660/cd9660_bmap.c
index e787f83a98cc1..e5fcd9ab32b34 100644
--- a/sys/fs/cd9660/cd9660_bmap.c
+++ b/sys/fs/cd9660/cd9660_bmap.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_bmap.c	8.3 (Berkeley) 1/23/94
- * $Id: cd9660_bmap.c,v 1.6 1997/02/22 09:38:47 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c
index 9713220483101..b9aabbc7e2b88 100644
--- a/sys/fs/cd9660/cd9660_lookup.c
+++ b/sys/fs/cd9660/cd9660_lookup.c
@@ -38,7 +38,7 @@
  *	from: @(#)ufs_lookup.c	7.33 (Berkeley) 5/19/91
  *
  *	@(#)cd9660_lookup.c	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_lookup.c,v 1.21 1999/01/27 21:49:54 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c
index ea22187acb743..d7093fe3fd7f1 100644
--- a/sys/fs/cd9660/cd9660_node.c
+++ b/sys/fs/cd9660/cd9660_node.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.c	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_node.c,v 1.27 1999/01/27 21:49:54 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/cd9660/cd9660_node.h b/sys/fs/cd9660/cd9660_node.h
index 46e54466fb9aa..0409efe2d8177 100644
--- a/sys/fs/cd9660/cd9660_node.h
+++ b/sys/fs/cd9660/cd9660_node.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.h	8.6 (Berkeley) 5/14/95
- * $Id: cd9660_node.h,v 1.17 1998/02/03 21:39:30 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c
index c4ad1d7b19a6d..b4f97a98e1123 100644
--- a/sys/fs/cd9660/cd9660_rrip.c
+++ b/sys/fs/cd9660/cd9660_rrip.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_rrip.c	8.6 (Berkeley) 12/5/94
- * $Id: cd9660_rrip.c,v 1.15 1999/05/11 19:54:24 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/cd9660/cd9660_rrip.h b/sys/fs/cd9660/cd9660_rrip.h
index cacee390d0746..5008abf2a0acb 100644
--- a/sys/fs/cd9660/cd9660_rrip.h
+++ b/sys/fs/cd9660/cd9660_rrip.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_rrip.h	8.2 (Berkeley) 12/5/94
- * $Id: cd9660_rrip.h,v 1.3.2000.1 1996/09/30 12:46:48 dfr Exp $
+ * $FreeBSD$
  */
   
 typedef struct {
diff --git a/sys/fs/cd9660/cd9660_util.c b/sys/fs/cd9660/cd9660_util.c
index 21d4b9bbc343a..2a11dc2f63616 100644
--- a/sys/fs/cd9660/cd9660_util.c
+++ b/sys/fs/cd9660/cd9660_util.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_util.c	8.3 (Berkeley) 12/5/94
- * $Id: cd9660_util.c,v 1.11 1999/04/18 10:58:02 dcs Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index 59421d07a57f2..0ed30ed79da8e 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vfsops.c	8.18 (Berkeley) 5/22/95
- * $Id: cd9660_vfsops.c,v 1.60 1999/08/25 12:24:39 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index 86cd115b6634d..ee2528b2d8cc1 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vnops.c	8.19 (Berkeley) 5/27/95
- * $Id: cd9660_vnops.c,v 1.56 1999/05/11 19:54:25 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/cd9660/iso.h b/sys/fs/cd9660/iso.h
index 5d211555e76ad..6a685d2465e99 100644
--- a/sys/fs/cd9660/iso.h
+++ b/sys/fs/cd9660/iso.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso.h	8.6 (Berkeley) 5/10/95
- * $Id: iso.h,v 1.16 1997/05/07 13:23:04 joerg Exp $
+ * $FreeBSD$
  */
 
 #define ISODCL(from, to) (to - from + 1)
diff --git a/sys/fs/cd9660/iso_rrip.h b/sys/fs/cd9660/iso_rrip.h
index 2b256d51eca02..0c06e98825ce7 100644
--- a/sys/fs/cd9660/iso_rrip.h
+++ b/sys/fs/cd9660/iso_rrip.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_rrip.h	8.2 (Berkeley) 1/23/94
- * $Id: iso_rrip.h,v 1.4 1997/02/22 09:38:52 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/fs/coda/cnode.h b/sys/fs/coda/cnode.h
index ee4573d510207..75d29acc22ed5 100644
--- a/sys/fs/coda/cnode.h
+++ b/sys/fs/coda/cnode.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/cnode.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: cnode.h,v 1.5 1998/11/11 20:32:20 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda.h b/sys/fs/coda/coda.h
index db2ec539b003f..5a25bc67f152c 100644
--- a/sys/fs/coda/coda.h
+++ b/sys/fs/coda/coda.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda.h,v 1.6 1998/11/11 20:32:20 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_fbsd.c b/sys/fs/coda/coda_fbsd.c
index 22a5963acd298..ea16d154b4f74 100644
--- a/sys/fs/coda/coda_fbsd.c
+++ b/sys/fs/coda/coda_fbsd.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_fbsd.cr,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_fbsd.c,v 1.15 1999/05/31 11:24:16 phk Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_io.h b/sys/fs/coda/coda_io.h
index e896ff0813b74..6620f4f0c32e8 100644
--- a/sys/fs/coda/coda_io.h
+++ b/sys/fs/coda/coda_io.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_io.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_io.h,v 1.4 1998/09/13 13:57:59 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_kernel.h b/sys/fs/coda/coda_kernel.h
index 33b372f49b139..cc0fd957f81c0 100644
--- a/sys/fs/coda/coda_kernel.h
+++ b/sys/fs/coda/coda_kernel.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_kernel.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_kernel.h,v 1.2 1998/09/02 19:09:53 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_namecache.c b/sys/fs/coda/coda_namecache.c
index 63ee9f9772f7d..23425b5a13dda 100644
--- a/sys/fs/coda/coda_namecache.c
+++ b/sys/fs/coda/coda_namecache.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_namecache.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_namecache.c,v 1.8 1998/10/28 19:33:50 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_namecache.h b/sys/fs/coda/coda_namecache.h
index e4739114c2c8a..11f2e80b12b29 100644
--- a/sys/fs/coda/coda_namecache.h
+++ b/sys/fs/coda/coda_namecache.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_namecache.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_namecache.h,v 1.4 1998/09/13 13:57:59 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_opstats.h b/sys/fs/coda/coda_opstats.h
index e62c04d3db1fc..8661a07ebfa0c 100644
--- a/sys/fs/coda/coda_opstats.h
+++ b/sys/fs/coda/coda_opstats.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_opstats.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_opstats.h,v 1.3 1998/09/11 18:50:17 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_pioctl.h b/sys/fs/coda/coda_pioctl.h
index 57bc67ed00219..2c2577ce57eed 100644
--- a/sys/fs/coda/coda_pioctl.h
+++ b/sys/fs/coda/coda_pioctl.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_pioctl.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_pioctl.h,v 1.4 1998/09/13 13:57:59 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_psdev.c b/sys/fs/coda/coda_psdev.c
index cde967f04c9bd..520702ba48d2d 100644
--- a/sys/fs/coda/coda_psdev.c
+++ b/sys/fs/coda/coda_psdev.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_psdev.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_psdev.c,v 1.10 1999/01/17 21:04:53 peter Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_psdev.h b/sys/fs/coda/coda_psdev.h
index 11922adfe02c5..c6276f3e710ca 100644
--- a/sys/fs/coda/coda_psdev.h
+++ b/sys/fs/coda/coda_psdev.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_psdev.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_psdev.c,v 1.4 1998/09/13 13:57:59 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_subr.c b/sys/fs/coda/coda_subr.c
index f64123321f3b3..aaf805c54ad62 100644
--- a/sys/fs/coda/coda_subr.c
+++ b/sys/fs/coda/coda_subr.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_subr.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_subr.c,v 1.9 1999/01/17 20:25:15 peter Exp $
+ * $FreeBSD$
  * 
   */
 
diff --git a/sys/fs/coda/coda_subr.h b/sys/fs/coda/coda_subr.h
index fe27bfda19ce8..71c8a3de38124 100644
--- a/sys/fs/coda/coda_subr.h
+++ b/sys/fs/coda/coda_subr.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_subr.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_subr.h,v 1.5 1998/09/13 13:57:59 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_venus.c b/sys/fs/coda/coda_venus.c
index 9853c7e834bbc..f27357498d459 100644
--- a/sys/fs/coda/coda_venus.c
+++ b/sys/fs/coda/coda_venus.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/cfs/coda_venus.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_venus.c,v 1.7 1999/05/11 19:53:51 phk Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_venus.h b/sys/fs/coda/coda_venus.h
index 6fdd15c60fada..392a73f071147 100644
--- a/sys/fs/coda/coda_venus.h
+++ b/sys/fs/coda/coda_venus.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_venus.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_venus.h,v 1.2 1998/09/02 19:09:53 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_vfsops.c b/sys/fs/coda/coda_vfsops.c
index fda83939beb52..35959df042397 100644
--- a/sys/fs/coda/coda_vfsops.c
+++ b/sys/fs/coda/coda_vfsops.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  *  	@(#) src/sys/cfs/coda_vfsops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_vfsops.c,v 1.16 1999/07/21 12:51:36 phk Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_vfsops.h b/sys/fs/coda/coda_vfsops.h
index ef23c3fd3828f..13a006d1b1c7f 100644
--- a/sys/fs/coda/coda_vfsops.h
+++ b/sys/fs/coda/coda_vfsops.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/cfs/coda_vfsops.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_vfsops.h,v 1.2 1998/09/02 19:09:53 rvb Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_vnops.c b/sys/fs/coda/coda_vnops.c
index b0a9bedec0cb7..6614b4b2c508d 100644
--- a/sys/fs/coda/coda_vnops.c
+++ b/sys/fs/coda/coda_vnops.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  *  	@(#) src/sys/coda/coda_vnops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_vnops.c,v 1.17 1999/08/08 13:22:05 bde Exp $
+ * $FreeBSD$
  * 
  */
 
diff --git a/sys/fs/coda/coda_vnops.h b/sys/fs/coda/coda_vnops.h
index d188eb6fe5ff6..0fb598582d751 100644
--- a/sys/fs/coda/coda_vnops.h
+++ b/sys/fs/coda/coda_vnops.h
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_vnops.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_vnops.h,v 1.4 1998/09/13 13:57:59 rvb Exp $
+ * $FreeBSD$
  * 
   */
 
diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c
index 4e3853ce54c50..f9acbd0435875 100644
--- a/sys/fs/deadfs/dead_vnops.c
+++ b/sys/fs/deadfs/dead_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dead_vnops.c	8.1 (Berkeley) 6/10/93
- * $Id: dead_vnops.c,v 1.24 1998/08/23 11:43:29 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/fdescfs/fdesc.h b/sys/fs/fdescfs/fdesc.h
index bbba54dcfdd80..463e52836918b 100644
--- a/sys/fs/fdescfs/fdesc.h
+++ b/sys/fs/fdescfs/fdesc.h
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc.h	8.5 (Berkeley) 1/21/94
  *
- * $Id: fdesc.h,v 1.5 1997/02/22 09:40:14 peter Exp $
+ * $FreeBSD$
  */
 
 #ifdef KERNEL
diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c
index 758f3b5abbe63..157454c502ef5 100644
--- a/sys/fs/fdescfs/fdesc_vfsops.c
+++ b/sys/fs/fdescfs/fdesc_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc_vfsops.c	8.4 (Berkeley) 1/21/94
  *
- * $Id: fdesc_vfsops.c,v 1.17 1999/01/12 11:49:30 eivind Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index bc0cb5b48b7de..17a38d5be9d61 100644
--- a/sys/fs/fdescfs/fdesc_vnops.c
+++ b/sys/fs/fdescfs/fdesc_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc_vnops.c	8.9 (Berkeley) 1/21/94
  *
- * $Id: fdesc_vnops.c,v 1.42 1999/05/31 11:27:49 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/fifofs/fifo.h b/sys/fs/fifofs/fifo.h
index ec186d0daccba..e630207528638 100644
--- a/sys/fs/fifofs/fifo.h
+++ b/sys/fs/fifofs/fifo.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo.h	8.6 (Berkeley) 5/21/95
- * $Id: fifo.h,v 1.14 1997/09/14 02:57:51 peter Exp $
+ * $FreeBSD$
  */
 
 extern vop_t **fifo_vnodeop_p;
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index f7e47e1284fbc..4a8199a672b5c 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.10 (Berkeley) 5/27/95
- * $Id: fifo_vnops.c,v 1.42 1998/02/04 22:32:45 eivind Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/msdosfs/bootsect.h b/sys/fs/msdosfs/bootsect.h
index 11b93371a534d..666c0f8f41b1c 100644
--- a/sys/fs/msdosfs/bootsect.h
+++ b/sys/fs/msdosfs/bootsect.h
@@ -1,4 +1,4 @@
-/*	$Id: bootsect.h,v 1.5 1997/02/22 09:40:43 peter Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: bootsect.h,v 1.9 1997/11/17 15:36:17 ws Exp $	*/
 
 /*
diff --git a/sys/fs/msdosfs/bpb.h b/sys/fs/msdosfs/bpb.h
index bc00a758de51d..88b9eefb859a8 100644
--- a/sys/fs/msdosfs/bpb.h
+++ b/sys/fs/msdosfs/bpb.h
@@ -1,4 +1,4 @@
-/*	$Id: bpb.h,v 1.5 1997/02/22 09:40:44 peter Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: bpb.h,v 1.7 1997/11/17 15:36:24 ws Exp $	*/
 
 /*
diff --git a/sys/fs/msdosfs/denode.h b/sys/fs/msdosfs/denode.h
index ba2ef8c65dab1..49eac87a20755 100644
--- a/sys/fs/msdosfs/denode.h
+++ b/sys/fs/msdosfs/denode.h
@@ -1,4 +1,4 @@
-/*	$Id: denode.h,v 1.17 1998/11/21 00:20:24 dt Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: denode.h,v 1.25 1997/11/17 15:36:28 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/direntry.h b/sys/fs/msdosfs/direntry.h
index 796fe78131c8e..3225b78b8936e 100644
--- a/sys/fs/msdosfs/direntry.h
+++ b/sys/fs/msdosfs/direntry.h
@@ -1,4 +1,4 @@
-/*	$Id: direntry.h,v 1.12 1998/02/26 06:45:42 msmith Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: direntry.h,v 1.14 1997/11/17 15:36:32 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/fat.h b/sys/fs/msdosfs/fat.h
index 74b05e2cf78db..9f20cbae41998 100644
--- a/sys/fs/msdosfs/fat.h
+++ b/sys/fs/msdosfs/fat.h
@@ -1,4 +1,4 @@
-/*	$Id: fat.h,v 1.6 1997/02/22 09:40:45 peter Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: fat.h,v 1.12 1997/11/17 15:36:36 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfs_conv.c b/sys/fs/msdosfs/msdosfs_conv.c
index 2c792ebf89bbb..8c43f93c0adc6 100644
--- a/sys/fs/msdosfs/msdosfs_conv.c
+++ b/sys/fs/msdosfs/msdosfs_conv.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_conv.c,v 1.27 1998/05/17 21:18:08 dt Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_conv.c,v 1.25 1997/11/17 15:36:40 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c
index 3c6f9d9179fc9..d864ddb5cea98 100644
--- a/sys/fs/msdosfs/msdosfs_denode.c
+++ b/sys/fs/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_denode.c,v 1.44 1999/01/02 11:34:56 bde Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_denode.c,v 1.28 1998/02/10 14:10:00 mrg Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfs_fat.c b/sys/fs/msdosfs/msdosfs_fat.c
index 1ec29db1d9c09..fae002774668f 100644
--- a/sys/fs/msdosfs/msdosfs_fat.c
+++ b/sys/fs/msdosfs/msdosfs_fat.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_fat.c,v 1.20 1998/04/06 11:39:04 phk Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_fat.c,v 1.28 1997/11/17 15:36:49 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfs_lookup.c b/sys/fs/msdosfs/msdosfs_lookup.c
index d2ad431d7f444..95e8e898ad305 100644
--- a/sys/fs/msdosfs/msdosfs_lookup.c
+++ b/sys/fs/msdosfs/msdosfs_lookup.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_lookup.c,v 1.28 1999/01/02 18:52:13 dt Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_lookup.c,v 1.37 1997/11/17 15:36:54 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c
index adb5b5a0ebbf9..92f00846514d5 100644
--- a/sys/fs/msdosfs/msdosfs_vfsops.c
+++ b/sys/fs/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vfsops.c,v 1.48 1999/08/23 21:07:13 bde Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index 3c0a033e8d3f5..2407e2e8a7207 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vnops.c,v 1.87 1999/07/25 04:01:32 bde Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $	*/
 
 /*-
diff --git a/sys/fs/msdosfs/msdosfsmount.h b/sys/fs/msdosfs/msdosfsmount.h
index 31a2a67560660..6bd6551341f07 100644
--- a/sys/fs/msdosfs/msdosfsmount.h
+++ b/sys/fs/msdosfs/msdosfsmount.h
@@ -1,4 +1,4 @@
-/*	$Id: msdosfsmount.h,v 1.15 1998/02/23 09:39:29 ache Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfsmount.h,v 1.17 1997/11/17 15:37:07 ws Exp $	*/
 
 /*-
diff --git a/sys/fs/ntfs/ntfs.h b/sys/fs/ntfs/ntfs.h
index 657c97159d058..7aa65288a00cf 100644
--- a/sys/fs/ntfs/ntfs.h
+++ b/sys/fs/ntfs/ntfs.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs.h,v 1.4 1999/04/20 21:06:41 semenu Exp $
+ * $FreeBSD$
  */
 
 /*#define NTFS_DEBUG 1*/
diff --git a/sys/fs/ntfs/ntfs_compr.c b/sys/fs/ntfs/ntfs_compr.c
index 953b4169d1f15..412047be2caa9 100644
--- a/sys/fs/ntfs/ntfs_compr.c
+++ b/sys/fs/ntfs/ntfs_compr.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_compr.c,v 1.4 1999/05/12 09:42:54 semenu Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/ntfs/ntfs_compr.h b/sys/fs/ntfs/ntfs_compr.h
index a79d3e239a26e..bdec08cc3e781 100644
--- a/sys/fs/ntfs/ntfs_compr.h
+++ b/sys/fs/ntfs/ntfs_compr.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_compr.h,v 1.3 1999/04/20 21:06:43 semenu Exp $
+ * $FreeBSD$
  */
 
 #define NTFS_COMPBLOCK_SIZE	0x1000
diff --git a/sys/fs/ntfs/ntfs_ihash.c b/sys/fs/ntfs/ntfs_ihash.c
index e795545279085..50ee7ac173533 100644
--- a/sys/fs/ntfs/ntfs_ihash.c
+++ b/sys/fs/ntfs/ntfs_ihash.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_ihash.c	8.7 (Berkeley) 5/17/95
- * $Id: ntfs_ihash.c,v 1.4 1999/05/11 19:54:50 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/ntfs/ntfs_ihash.h b/sys/fs/ntfs/ntfs_ihash.h
index 1b9c3dcd48a07..16132a90f9196 100644
--- a/sys/fs/ntfs/ntfs_ihash.h
+++ b/sys/fs/ntfs/ntfs_ihash.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_ihash.h,v 1.2 1999/04/20 21:06:43 semenu Exp $
+ * $FreeBSD$
  */
 
 void ntfs_nthashinit __P((void));
diff --git a/sys/fs/ntfs/ntfs_inode.h b/sys/fs/ntfs/ntfs_inode.h
index 0b6f6a202b26c..a61338552804a 100644
--- a/sys/fs/ntfs/ntfs_inode.h
+++ b/sys/fs/ntfs/ntfs_inode.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_inode.h,v 1.3 1999/04/20 21:06:43 semenu Exp $
+ * $FreeBSD$
  */
 
 /* These flags are kept in i_flag. */
diff --git a/sys/fs/ntfs/ntfs_subr.c b/sys/fs/ntfs/ntfs_subr.c
index 46b45de3d1a9a..b3e75b334d83e 100644
--- a/sys/fs/ntfs/ntfs_subr.c
+++ b/sys/fs/ntfs/ntfs_subr.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_subr.c,v 1.4 1999/05/12 09:43:01 semenu Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/ntfs/ntfs_subr.h b/sys/fs/ntfs/ntfs_subr.h
index ca5f45cd4632a..f0b9a8a1df44d 100644
--- a/sys/fs/ntfs/ntfs_subr.h
+++ b/sys/fs/ntfs/ntfs_subr.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_subr.h,v 1.3 1999/04/20 21:06:43 semenu Exp $
+ * $FreeBSD$
  */
 
 #define	VA_LOADED		0x0001
diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c
index 44877bd2e5d64..183d5dcd03cd5 100644
--- a/sys/fs/ntfs/ntfs_vfsops.c
+++ b/sys/fs/ntfs/ntfs_vfsops.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_vfsops.c,v 1.9 1999/08/13 10:29:29 phk Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/fs/ntfs/ntfs_vfsops.h b/sys/fs/ntfs/ntfs_vfsops.h
index 015684c90311c..d7f5f5d26a119 100644
--- a/sys/fs/ntfs/ntfs_vfsops.h
+++ b/sys/fs/ntfs/ntfs_vfsops.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_vfsops.h,v 1.2 1999/04/20 21:06:43 semenu Exp $
+ * $FreeBSD$
  */
 #define VG_DONTLOADIN	0x0001	/* Tells ntfs_vgetex to do not call */
 				/* ntfs_loadnode on ntnode, even if */
diff --git a/sys/fs/ntfs/ntfs_vnops.c b/sys/fs/ntfs/ntfs_vnops.c
index fff9add0a3221..578f8bf62dfb6 100644
--- a/sys/fs/ntfs/ntfs_vnops.c
+++ b/sys/fs/ntfs/ntfs_vnops.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_vnops.c,v 1.5 1999/05/12 09:43:06 semenu Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/fs/ntfs/ntfsmount.h b/sys/fs/ntfs/ntfsmount.h
index 1e6d322c71947..0a1f7918e383d 100644
--- a/sys/fs/ntfs/ntfsmount.h
+++ b/sys/fs/ntfs/ntfsmount.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfsmount.h,v 1.3 1999/04/20 21:06:44 semenu Exp $
+ * $FreeBSD$
  */
 
 #define	NTFS_MFLAG_CASEINS	0x00000001
diff --git a/sys/fs/nullfs/null.h b/sys/fs/nullfs/null.h
index 7d46a11cd4ac7..f796d18c67063 100644
--- a/sys/fs/nullfs/null.h
+++ b/sys/fs/nullfs/null.h
@@ -35,7 +35,7 @@
  *
  *	@(#)null.h	8.3 (Berkeley) 8/20/94
  *
- * $Id: null.h,v 1.7 1997/05/25 04:50:02 peter Exp $
+ * $FreeBSD$
  */
 
 struct null_args {
diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c
index 603f418fb1c31..1504fc84ac0eb 100644
--- a/sys/fs/nullfs/null_subr.c
+++ b/sys/fs/nullfs/null_subr.c
@@ -35,7 +35,7 @@
  *
  *	@(#)null_subr.c	8.7 (Berkeley) 5/14/95
  *
- * $Id: null_subr.c,v 1.18 1998/07/15 02:32:18 bde Exp $
+ * $FreeBSD$
  */
 
 #include "opt_debug_nullfs.h"
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index 4ead5bd50c9fd..f6ac5a0f749a6 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -36,7 +36,7 @@
  *	@(#)null_vfsops.c	8.2 (Berkeley) 1/21/94
  *
  * @(#)lofs_vfsops.c	1.2 (Berkeley) 6/18/92
- * $Id: null_vfsops.c,v 1.27 1998/07/30 17:40:45 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index 638b9edfa69fc..c9019210da55e 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -37,11 +37,11 @@
  *
  * Ancestors:
  *	@(#)lofs_vnops.c	1.2 (Berkeley) 6/18/92
- *	$Id: null_vnops.c,v 1.33 1999/06/16 23:27:38 mckusick Exp $
+ * $FreeBSD$
  *	...and...
  *	@(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
  *
- * $Id: null_vnops.c,v 1.33 1999/06/16 23:27:38 mckusick Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/portalfs/portal.h b/sys/fs/portalfs/portal.h
index d60826e6a1697..6e781455d75b3 100644
--- a/sys/fs/portalfs/portal.h
+++ b/sys/fs/portalfs/portal.h
@@ -35,7 +35,7 @@
  *
  *	@(#)portal.h	8.4 (Berkeley) 1/21/94
  *
- * $Id: portal.h,v 1.4 1997/02/22 09:40:24 peter Exp $
+ * $FreeBSD$
  */
 
 struct portal_args {
diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c
index 633bf776e10b4..d447664171f1c 100644
--- a/sys/fs/portalfs/portal_vfsops.c
+++ b/sys/fs/portalfs/portal_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vfsops.c	8.11 (Berkeley) 5/14/95
  *
- * $Id: portal_vfsops.c,v 1.21 1998/05/06 05:29:35 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c
index ad96332d45104..f158eadffd07b 100644
--- a/sys/fs/portalfs/portal_vnops.c
+++ b/sys/fs/portalfs/portal_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vnops.c	8.14 (Berkeley) 5/21/95
  *
- * $Id: portal_vnops.c,v 1.35 1999/01/12 11:49:30 eivind Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/procfs/README b/sys/fs/procfs/README
index 5f1b6cc7229be..f816b321b432c 100644
--- a/sys/fs/procfs/README
+++ b/sys/fs/procfs/README
@@ -110,4 +110,4 @@ the debugger, the debugger should fork and the child should stop itself
 "attach".  as before, the child will hit a breakpoint on the first
 instruction in any newly exec'd image.
 
-$Id$
+$FreeBSD$
diff --git a/sys/fs/procfs/procfs.h b/sys/fs/procfs/procfs.h
index f813070e699e5..07c6da215a585 100644
--- a/sys/fs/procfs/procfs.h
+++ b/sys/fs/procfs/procfs.h
@@ -37,7 +37,7 @@
  *	@(#)procfs.h	8.9 (Berkeley) 5/14/95
  *
  * From:
- *	$Id: procfs.h,v 1.26 1999/06/13 20:53:13 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/procfs/procfs_ctl.c b/sys/fs/procfs/procfs_ctl.c
index 21724e5c294c0..4f4d84bf02af6 100644
--- a/sys/fs/procfs/procfs_ctl.c
+++ b/sys/fs/procfs/procfs_ctl.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_ctl.c	8.4 (Berkeley) 6/15/94
  *
  * From:
- *	$Id: procfs_ctl.c,v 1.16 1997/04/27 21:32:21 alex Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_dbregs.c b/sys/fs/procfs/procfs_dbregs.c
index 02509e006d78d..ce990e9837455 100644
--- a/sys/fs/procfs/procfs_dbregs.c
+++ b/sys/fs/procfs/procfs_dbregs.c
@@ -40,7 +40,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_fpregs.c b/sys/fs/procfs/procfs_fpregs.c
index 14c3fd39c04e3..b3331e5a726e6 100644
--- a/sys/fs/procfs/procfs_fpregs.c
+++ b/sys/fs/procfs/procfs_fpregs.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_fpregs.c	8.2 (Berkeley) 6/15/94
  *
  * From:
- *	$Id: procfs_fpregs.c,v 1.7 1997/08/02 14:32:11 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_map.c b/sys/fs/procfs/procfs_map.c
index 47a0ce17c7e73..83d73ab320d3a 100644
--- a/sys/fs/procfs/procfs_map.c
+++ b/sys/fs/procfs/procfs_map.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_status.c	8.3 (Berkeley) 2/17/94
  *
- *	$Id: procfs_map.c,v 1.21 1999/02/07 21:48:21 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c
index 5fe9ef6794d91..35ee564e074b3 100644
--- a/sys/fs/procfs/procfs_mem.c
+++ b/sys/fs/procfs/procfs_mem.c
@@ -37,7 +37,7 @@
  *
  *	@(#)procfs_mem.c	8.5 (Berkeley) 6/15/94
  *
- *	$Id: procfs_mem.c,v 1.36 1999/04/27 11:16:37 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/procfs/procfs_note.c b/sys/fs/procfs/procfs_note.c
index 8bfde33b640ac..273010b329563 100644
--- a/sys/fs/procfs/procfs_note.c
+++ b/sys/fs/procfs/procfs_note.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_note.c	8.2 (Berkeley) 1/21/94
  *
- *	$Id: procfs_note.c,v 1.4 1997/02/22 09:40:28 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_regs.c b/sys/fs/procfs/procfs_regs.c
index d215d44a33cf4..0edb9ad606396 100644
--- a/sys/fs/procfs/procfs_regs.c
+++ b/sys/fs/procfs/procfs_regs.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_regs.c	8.4 (Berkeley) 6/15/94
  *
  * From:
- *	$Id: procfs_regs.c,v 1.7 1997/08/02 14:32:16 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_rlimit.c b/sys/fs/procfs/procfs_rlimit.c
index 07bcd1061936a..5f00aafd072e5 100644
--- a/sys/fs/procfs/procfs_rlimit.c
+++ b/sys/fs/procfs/procfs_rlimit.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_status.c	8.4 (Berkeley) 6/15/94
  *
- *	$Id: procfs_rlimit.c,v 1.2 1999/07/09 17:56:59 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/procfs/procfs_status.c b/sys/fs/procfs/procfs_status.c
index 2c8cb697ad63b..b3ebd1f1983cf 100644
--- a/sys/fs/procfs/procfs_status.c
+++ b/sys/fs/procfs/procfs_status.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_status.c	8.4 (Berkeley) 6/15/94
  *
  * From:
- *	$Id: procfs_status.c,v 1.14 1999/05/22 20:10:26 dt Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_subr.c b/sys/fs/procfs/procfs_subr.c
index cf313e8638564..01e8ae9e014aa 100644
--- a/sys/fs/procfs/procfs_subr.c
+++ b/sys/fs/procfs/procfs_subr.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_subr.c	8.6 (Berkeley) 5/14/95
  *
- *	$Id: procfs_subr.c,v 1.24 1999/04/30 13:04:21 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_type.c b/sys/fs/procfs/procfs_type.c
index 8f85c548b03f8..cb2a45f6a3d6a 100644
--- a/sys/fs/procfs/procfs_type.c
+++ b/sys/fs/procfs/procfs_type.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: procfs_type.c,v 1.4 1997/03/24 11:24:42 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/procfs/procfs_vfsops.c b/sys/fs/procfs/procfs_vfsops.c
index 2c22020e4fc0b..0478e386d51c4 100644
--- a/sys/fs/procfs/procfs_vfsops.c
+++ b/sys/fs/procfs/procfs_vfsops.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_vfsops.c	8.7 (Berkeley) 5/10/95
  *
- *	$Id: procfs_vfsops.c,v 1.26 1998/09/07 13:17:01 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/procfs/procfs_vnops.c b/sys/fs/procfs/procfs_vnops.c
index 9040c5bf4b41c..2eb893415eeae 100644
--- a/sys/fs/procfs/procfs_vnops.c
+++ b/sys/fs/procfs/procfs_vnops.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_vnops.c	8.18 (Berkeley) 5/21/95
  *
- *	$Id: procfs_vnops.c,v 1.70 1999/07/09 04:16:00 jlemon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index ca1835e5cd83a..1afc40017da4f 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spec_vnops.c	8.14 (Berkeley) 5/21/95
- * $Id: spec_vnops.c,v 1.98 1999/08/25 00:26:34 julian Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/umapfs/umap.h b/sys/fs/umapfs/umap.h
index 0c6ca3418245e..09963cbe2b655 100644
--- a/sys/fs/umapfs/umap.h
+++ b/sys/fs/umapfs/umap.h
@@ -35,7 +35,7 @@
  *
  *	@(#)umap.h	8.4 (Berkeley) 8/20/94
  *
- * $Id: umap.h,v 1.8 1997/02/22 09:40:37 peter Exp $
+ * $FreeBSD$
  */
 
 #define MAPFILEENTRIES 64
diff --git a/sys/fs/umapfs/umap_subr.c b/sys/fs/umapfs/umap_subr.c
index 4974f03c110c6..ed316a944cb12 100644
--- a/sys/fs/umapfs/umap_subr.c
+++ b/sys/fs/umapfs/umap_subr.c
@@ -35,7 +35,7 @@
  *
  *	@(#)umap_subr.c	8.9 (Berkeley) 5/14/95
  *
- * $Id: umap_subr.c,v 1.15 1998/11/09 09:21:25 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/umapfs/umap_vfsops.c b/sys/fs/umapfs/umap_vfsops.c
index 3acc700a64fc0..658a4ceee1826 100644
--- a/sys/fs/umapfs/umap_vfsops.c
+++ b/sys/fs/umapfs/umap_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)umap_vfsops.c	8.8 (Berkeley) 5/14/95
  *
- * $Id: umap_vfsops.c,v 1.24 1999/03/12 19:40:39 imp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/umapfs/umap_vnops.c b/sys/fs/umapfs/umap_vnops.c
index ae47731b92153..0b73ccbb39dcf 100644
--- a/sys/fs/umapfs/umap_vnops.c
+++ b/sys/fs/umapfs/umap_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)umap_vnops.c	8.6 (Berkeley) 5/22/95
- * $Id: umap_vnops.c,v 1.27 1999/06/16 23:27:41 mckusick Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/unionfs/union.h b/sys/fs/unionfs/union.h
index 6a4aa226203e2..1fc5f996cab09 100644
--- a/sys/fs/unionfs/union.h
+++ b/sys/fs/unionfs/union.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union.h	8.9 (Berkeley) 12/10/94
- * $Id: union.h,v 1.12 1998/02/26 03:23:51 kato Exp $
+ * $FreeBSD$
  */
 
 struct union_args {
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
index 5ced12f6e322a..6334810ae622c 100644
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/union_subr.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_subr.c	8.20 (Berkeley) 5/20/95
- * $Id: union_subr.c,v 1.36 1998/12/14 05:00:59 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c
index db4d4d3b14e8e..a02fb9a71f8ff 100644
--- a/sys/fs/unionfs/union_vfsops.c
+++ b/sys/fs/unionfs/union_vfsops.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vfsops.c	8.20 (Berkeley) 5/20/95
- * $Id: union_vfsops.c,v 1.30 1998/09/07 13:17:02 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index 25d2dfd2bf874..145f8ca6f0ad5 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vnops.c	8.32 (Berkeley) 6/23/95
- * $Id: union_vnops.c,v 1.61 1999/06/16 23:27:43 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c
index e4faa3f4b8a6f..7badacb7d7c00 100644
--- a/sys/geom/geom_ccd.c
+++ b/sys/geom/geom_ccd.c
@@ -1,4 +1,4 @@
-/* $Id: ccd.c,v 1.52 1999/08/14 11:40:34 phk Exp $ */
+/* $FreeBSD$ */
 
 /*	$NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $	*/
 
diff --git a/sys/gnu/ext2fs/ext2_bmap.c b/sys/gnu/ext2fs/ext2_bmap.c
index 9a477c51fb42e..cf564071491de 100644
--- a/sys/gnu/ext2fs/ext2_bmap.c
+++ b/sys/gnu/ext2fs/ext2_bmap.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_bmap.c	8.7 (Berkeley) 3/21/95
- * $Id: ufs_bmap.c,v 1.29 1999/08/08 18:43:03 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/ext2fs/ext2_ihash.c b/sys/gnu/ext2fs/ext2_ihash.c
index c2dd63e5b7f23..0a7c7d5831911 100644
--- a/sys/gnu/ext2fs/ext2_ihash.c
+++ b/sys/gnu/ext2fs/ext2_ihash.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_ihash.c	8.7 (Berkeley) 5/17/95
- * $Id: ufs_ihash.c,v 1.18 1999/01/02 11:34:56 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/ext2fs/ext2_mount.h b/sys/gnu/ext2fs/ext2_mount.h
index 70652b58f9ba3..44974548e70a2 100644
--- a/sys/gnu/ext2fs/ext2_mount.h
+++ b/sys/gnu/ext2fs/ext2_mount.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufsmount.h	8.6 (Berkeley) 3/30/95
- * $Id: ufsmount.h,v 1.13 1998/01/30 11:34:06 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_UFS_UFSMOUNT_H_
diff --git a/sys/gnu/ext2fs/inode.h b/sys/gnu/ext2fs/inode.h
index 77fe7b3983b75..78fbc0adaff59 100644
--- a/sys/gnu/ext2fs/inode.h
+++ b/sys/gnu/ext2fs/inode.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.9 (Berkeley) 5/14/95
- * $Id: inode.h,v 1.25 1999/03/06 05:21:09 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_UFS_INODE_H_
diff --git a/sys/gnu/fs/ext2fs/ext2_bmap.c b/sys/gnu/fs/ext2fs/ext2_bmap.c
index 9a477c51fb42e..cf564071491de 100644
--- a/sys/gnu/fs/ext2fs/ext2_bmap.c
+++ b/sys/gnu/fs/ext2fs/ext2_bmap.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_bmap.c	8.7 (Berkeley) 3/21/95
- * $Id: ufs_bmap.c,v 1.29 1999/08/08 18:43:03 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_mount.h b/sys/gnu/fs/ext2fs/ext2_mount.h
index 70652b58f9ba3..44974548e70a2 100644
--- a/sys/gnu/fs/ext2fs/ext2_mount.h
+++ b/sys/gnu/fs/ext2fs/ext2_mount.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufsmount.h	8.6 (Berkeley) 3/30/95
- * $Id: ufsmount.h,v 1.13 1998/01/30 11:34:06 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_UFS_UFSMOUNT_H_
diff --git a/sys/gnu/fs/ext2fs/inode.h b/sys/gnu/fs/ext2fs/inode.h
index 77fe7b3983b75..78fbc0adaff59 100644
--- a/sys/gnu/fs/ext2fs/inode.h
+++ b/sys/gnu/fs/ext2fs/inode.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.9 (Berkeley) 5/14/95
- * $Id: inode.h,v 1.25 1999/03/06 05:21:09 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_UFS_INODE_H_
diff --git a/sys/gnu/i386/fpemul/control_w.h b/sys/gnu/i386/fpemul/control_w.h
index 9ab4345b876dd..5c7aca44cc87a 100644
--- a/sys/gnu/i386/fpemul/control_w.h
+++ b/sys/gnu/i386/fpemul/control_w.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *        $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/div_small.s b/sys/gnu/i386/fpemul/div_small.s
index 602250020ef06..944a93f3b1929 100644
--- a/sys/gnu/i386/fpemul/div_small.s
+++ b/sys/gnu/i386/fpemul/div_small.s
@@ -57,7 +57,7 @@
  * W. Metzenthen   June 1994.
  *
  * 
- *     $Id: div_small.s,v 1.6 1997/02/22 09:29:00 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/errors.c b/sys/gnu/i386/fpemul/errors.c
index f16b6a0b7e726..7ee9136bc15b7 100644
--- a/sys/gnu/i386/fpemul/errors.c
+++ b/sys/gnu/i386/fpemul/errors.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: errors.c,v 1.8 1997/06/14 15:11:03 bde Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/exception.h b/sys/gnu/i386/fpemul/exception.h
index 88316f88e9815..50e7d602eb695 100644
--- a/sys/gnu/i386/fpemul/exception.h
+++ b/sys/gnu/i386/fpemul/exception.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: exception.h,v 1.7 1997/02/22 09:29:02 peter Exp $
+ * $FreeBSD$
  *
  *
  */
diff --git a/sys/gnu/i386/fpemul/fpu_arith.c b/sys/gnu/i386/fpemul/fpu_arith.c
index c2183ba75d970..e8fa93f444004 100644
--- a/sys/gnu/i386/fpemul/fpu_arith.c
+++ b/sys/gnu/i386/fpemul/fpu_arith.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: fpu_arith.c,v 1.7 1997/02/22 09:29:03 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_asm.h b/sys/gnu/i386/fpemul/fpu_asm.h
index c72784b5cf704..ab505e906dc1d 100644
--- a/sys/gnu/i386/fpemul/fpu_asm.h
+++ b/sys/gnu/i386/fpemul/fpu_asm.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: fpu_asm.h,v 1.6 1997/02/22 09:29:03 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_aux.c b/sys/gnu/i386/fpemul/fpu_aux.c
index 26bb61df769b2..71b759f1e571f 100644
--- a/sys/gnu/i386/fpemul/fpu_aux.c
+++ b/sys/gnu/i386/fpemul/fpu_aux.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: fpu_aux.c,v 1.7 1997/02/22 09:29:04 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_emu.h b/sys/gnu/i386/fpemul/fpu_emu.h
index 8571c8bbda6bc..0dd2f7e49b211 100644
--- a/sys/gnu/i386/fpemul/fpu_emu.h
+++ b/sys/gnu/i386/fpemul/fpu_emu.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_entry.c b/sys/gnu/i386/fpemul/fpu_entry.c
index 35eb84bc507f1..049b0139171eb 100644
--- a/sys/gnu/i386/fpemul/fpu_entry.c
+++ b/sys/gnu/i386/fpemul/fpu_entry.c
@@ -55,7 +55,7 @@
  *
  * W. Metzenthen   June 1994.
  *
- *  $Id: fpu_entry.c,v 1.19 1999/01/17 20:28:12 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_etc.c b/sys/gnu/i386/fpemul/fpu_etc.c
index 0e1865360877b..cd91e80da62ff 100644
--- a/sys/gnu/i386/fpemul/fpu_etc.c
+++ b/sys/gnu/i386/fpemul/fpu_etc.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: fpu_etc.c,v 1.6 1997/02/22 09:29:06 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_proto.h b/sys/gnu/i386/fpemul/fpu_proto.h
index 6e87579e39fd9..fc36478eedb5e 100644
--- a/sys/gnu/i386/fpemul/fpu_proto.h
+++ b/sys/gnu/i386/fpemul/fpu_proto.h
@@ -1,6 +1,6 @@
 /*
  *
- *    $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_system.h b/sys/gnu/i386/fpemul/fpu_system.h
index dc3efe28e4a4c..aff0a0d9114b0 100644
--- a/sys/gnu/i386/fpemul/fpu_system.h
+++ b/sys/gnu/i386/fpemul/fpu_system.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/fpu_trig.c b/sys/gnu/i386/fpemul/fpu_trig.c
index 9d9ce227fb083..b1d913facd22c 100644
--- a/sys/gnu/i386/fpemul/fpu_trig.c
+++ b/sys/gnu/i386/fpemul/fpu_trig.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: fpu_trig.c,v 1.8 1997/02/22 09:29:08 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/get_address.c b/sys/gnu/i386/fpemul/get_address.c
index ccaf68475265a..4ae998b2d3fc3 100644
--- a/sys/gnu/i386/fpemul/get_address.c
+++ b/sys/gnu/i386/fpemul/get_address.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: get_address.c,v 1.6 1997/02/22 09:29:09 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/load_store.c b/sys/gnu/i386/fpemul/load_store.c
index 50eec3e9ada0b..2cfbba5061474 100644
--- a/sys/gnu/i386/fpemul/load_store.c
+++ b/sys/gnu/i386/fpemul/load_store.c
@@ -57,7 +57,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: load_store.c,v 1.11 1997/08/31 22:22:19 bde Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/math_emu.h b/sys/gnu/i386/fpemul/math_emu.h
index f57a427f5ed12..302be7b655ac6 100644
--- a/sys/gnu/i386/fpemul/math_emu.h
+++ b/sys/gnu/i386/fpemul/math_emu.h
@@ -1,6 +1,6 @@
 /*
  *
- *    $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_2xm1.c b/sys/gnu/i386/fpemul/poly_2xm1.c
index c7902e5c50ee6..e5a651574e4d6 100644
--- a/sys/gnu/i386/fpemul/poly_2xm1.c
+++ b/sys/gnu/i386/fpemul/poly_2xm1.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *   $Id: poly_2xm1.c,v 1.6 1997/02/22 09:29:14 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_atan.c b/sys/gnu/i386/fpemul/poly_atan.c
index c7379bf892379..4f937fb82dc86 100644
--- a/sys/gnu/i386/fpemul/poly_atan.c
+++ b/sys/gnu/i386/fpemul/poly_atan.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: poly_atan.c,v 1.8 1997/02/22 09:29:15 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_div.s b/sys/gnu/i386/fpemul/poly_div.s
index 318dc1682ecfc..505588d38bd8a 100644
--- a/sys/gnu/i386/fpemul/poly_div.s
+++ b/sys/gnu/i386/fpemul/poly_div.s
@@ -57,7 +57,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: poly_div.s,v 1.6 1997/02/22 09:29:16 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_l2.c b/sys/gnu/i386/fpemul/poly_l2.c
index a4684c9547f17..19a550165f926 100644
--- a/sys/gnu/i386/fpemul/poly_l2.c
+++ b/sys/gnu/i386/fpemul/poly_l2.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: poly_l2.c,v 1.8 1997/02/22 09:29:17 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_mul64.s b/sys/gnu/i386/fpemul/poly_mul64.s
index e8089d0a53188..2c6f12e2a2f5e 100644
--- a/sys/gnu/i386/fpemul/poly_mul64.s
+++ b/sys/gnu/i386/fpemul/poly_mul64.s
@@ -59,7 +59,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: poly_mul64.s,v 1.6 1997/02/22 09:29:17 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_sin.c b/sys/gnu/i386/fpemul/poly_sin.c
index 8bcbe93f807d8..efc478f59d9c8 100644
--- a/sys/gnu/i386/fpemul/poly_sin.c
+++ b/sys/gnu/i386/fpemul/poly_sin.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: poly_sin.c,v 1.8 1997/02/22 09:29:18 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/poly_tan.c b/sys/gnu/i386/fpemul/poly_tan.c
index 541f2137d6896..7dbbddfccd563 100644
--- a/sys/gnu/i386/fpemul/poly_tan.c
+++ b/sys/gnu/i386/fpemul/poly_tan.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *      $Id: poly_tan.c,v 1.8 1997/02/22 09:29:19 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/polynomial.s b/sys/gnu/i386/fpemul/polynomial.s
index e989225cb12b1..172bcc67dd6e5 100644
--- a/sys/gnu/i386/fpemul/polynomial.s
+++ b/sys/gnu/i386/fpemul/polynomial.s
@@ -64,7 +64,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: polynomial.s,v 1.6 1997/02/22 09:29:19 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_add_sub.c b/sys/gnu/i386/fpemul/reg_add_sub.c
index b873fca5deb41..df08bcd97a1b9 100644
--- a/sys/gnu/i386/fpemul/reg_add_sub.c
+++ b/sys/gnu/i386/fpemul/reg_add_sub.c
@@ -55,7 +55,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_add_sub.c,v 1.6 1997/02/22 09:29:20 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_compare.c b/sys/gnu/i386/fpemul/reg_compare.c
index abc0d224ee02f..a23a7a5b15032 100644
--- a/sys/gnu/i386/fpemul/reg_compare.c
+++ b/sys/gnu/i386/fpemul/reg_compare.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_compare.c,v 1.9 1997/06/14 15:11:05 bde Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_constant.h b/sys/gnu/i386/fpemul/reg_constant.h
index 2c63cfa3c0744..6c22cd7f48d09 100644
--- a/sys/gnu/i386/fpemul/reg_constant.h
+++ b/sys/gnu/i386/fpemul/reg_constant.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_div.s b/sys/gnu/i386/fpemul/reg_div.s
index adac83252a3a0..fe73048da9a5a 100644
--- a/sys/gnu/i386/fpemul/reg_div.s
+++ b/sys/gnu/i386/fpemul/reg_div.s
@@ -60,7 +60,7 @@
  * W. Metzenthen   June 1994.
  *
  * 
- *      $Id: reg_div.s,v 1.7 1997/04/22 06:54:50 jdp Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_ld_str.c b/sys/gnu/i386/fpemul/reg_ld_str.c
index bb569b894b3b1..5a2bcb8126956 100644
--- a/sys/gnu/i386/fpemul/reg_ld_str.c
+++ b/sys/gnu/i386/fpemul/reg_ld_str.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_ld_str.c,v 1.11 1997/08/31 22:22:21 bde Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_mul.c b/sys/gnu/i386/fpemul/reg_mul.c
index e82da30b19f1b..1b9cf2bce8c30 100644
--- a/sys/gnu/i386/fpemul/reg_mul.c
+++ b/sys/gnu/i386/fpemul/reg_mul.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_mul.c,v 1.6 1997/02/22 09:29:23 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_norm.s b/sys/gnu/i386/fpemul/reg_norm.s
index f1a24f3002f64..40d6a1d83cebc 100644
--- a/sys/gnu/i386/fpemul/reg_norm.s
+++ b/sys/gnu/i386/fpemul/reg_norm.s
@@ -61,7 +61,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_norm.s,v 1.6 1997/02/22 09:29:24 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_round.s b/sys/gnu/i386/fpemul/reg_round.s
index de20c51995c47..a01422f31b6bc 100644
--- a/sys/gnu/i386/fpemul/reg_round.s
+++ b/sys/gnu/i386/fpemul/reg_round.s
@@ -65,7 +65,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_round.s,v 1.7 1997/04/22 06:54:52 jdp Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_u_add.s b/sys/gnu/i386/fpemul/reg_u_add.s
index 0e963a34950d7..fb7080966fe55 100644
--- a/sys/gnu/i386/fpemul/reg_u_add.s
+++ b/sys/gnu/i386/fpemul/reg_u_add.s
@@ -62,7 +62,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_u_add.s,v 1.7 1997/04/22 06:54:52 jdp Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_u_div.s b/sys/gnu/i386/fpemul/reg_u_div.s
index 9061c908ccc4e..8a7c234b0a944 100644
--- a/sys/gnu/i386/fpemul/reg_u_div.s
+++ b/sys/gnu/i386/fpemul/reg_u_div.s
@@ -57,7 +57,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *      $Id: reg_u_div.s,v 1.7 1997/04/22 06:54:53 jdp Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_u_mul.s b/sys/gnu/i386/fpemul/reg_u_mul.s
index 6133286b060e7..4ce893cbd7447 100644
--- a/sys/gnu/i386/fpemul/reg_u_mul.s
+++ b/sys/gnu/i386/fpemul/reg_u_mul.s
@@ -57,7 +57,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_u_mul.s,v 1.7 1997/04/22 06:54:54 jdp Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/reg_u_sub.s b/sys/gnu/i386/fpemul/reg_u_sub.s
index df8baa49057b5..e24c4afce7171 100644
--- a/sys/gnu/i386/fpemul/reg_u_sub.s
+++ b/sys/gnu/i386/fpemul/reg_u_sub.s
@@ -61,7 +61,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_u_sub.s,v 1.7 1997/04/22 06:54:55 jdp Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/status_w.h b/sys/gnu/i386/fpemul/status_w.h
index cf82a12974b3d..4d15641598e21 100644
--- a/sys/gnu/i386/fpemul/status_w.h
+++ b/sys/gnu/i386/fpemul/status_w.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/version.h b/sys/gnu/i386/fpemul/version.h
index 98830e111bfe0..38f6b93aebb53 100644
--- a/sys/gnu/i386/fpemul/version.h
+++ b/sys/gnu/i386/fpemul/version.h
@@ -54,7 +54,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/wm_shrx.s b/sys/gnu/i386/fpemul/wm_shrx.s
index b50199d064afd..e64219fd9419b 100644
--- a/sys/gnu/i386/fpemul/wm_shrx.s
+++ b/sys/gnu/i386/fpemul/wm_shrx.s
@@ -62,7 +62,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: wm_shrx.s,v 1.6 1997/02/22 09:29:29 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/fpemul/wm_sqrt.s b/sys/gnu/i386/fpemul/wm_sqrt.s
index f79329e0e174b..dac6389796a0e 100644
--- a/sys/gnu/i386/fpemul/wm_sqrt.s
+++ b/sys/gnu/i386/fpemul/wm_sqrt.s
@@ -60,7 +60,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: wm_sqrt.s,v 1.7 1997/04/22 06:54:57 jdp Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c
index 3e7e14e5f24c4..60008abe5133c 100644
--- a/sys/gnu/i386/isa/dgb.c
+++ b/sys/gnu/i386/isa/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.50 1999/05/31 11:25:31 phk Exp $
+ *  dgb.c $FreeBSD$
  *
  *  Digiboard driver.
  *
diff --git a/sys/gnu/i386/isa/dgm.c b/sys/gnu/i386/isa/dgm.c
index b289be432d50c..5deb61df96815 100644
--- a/sys/gnu/i386/isa/dgm.c
+++ b/sys/gnu/i386/isa/dgm.c
@@ -1,5 +1,5 @@
 /*-
- *	$Id: dgm.c,v 1.15 1999/05/31 11:25:33 phk Exp $
+ * $FreeBSD$
  *
  *  This driver and the associated header files support the ISA PC/Xem
  *  Digiboards.  Its evolutionary roots are described below.
diff --git a/sys/gnu/i386/isa/dgmbios.h b/sys/gnu/i386/isa/dgmbios.h
index 3193c9dafb2ba..498bced5358ae 100644
--- a/sys/gnu/i386/isa/dgmbios.h
+++ b/sys/gnu/i386/isa/dgmbios.h
@@ -1,5 +1,5 @@
 /*
- *	$Id$
+ * $FreeBSD$
  *
  * This file is an ascii copy of the file sxbios.bin included in the
  * Digiboard PC/Xem driver for Linux.  It is copyright 1992, DIGI 
diff --git a/sys/gnu/i386/isa/dgmfep.h b/sys/gnu/i386/isa/dgmfep.h
index ed30e4a2fe6ff..7921fa3b058f5 100644
--- a/sys/gnu/i386/isa/dgmfep.h
+++ b/sys/gnu/i386/isa/dgmfep.h
@@ -1,5 +1,5 @@
 /*
- *	$Id$
+ * $FreeBSD$
  *
  * This file is an ascii copy of the file sxbios.bin included in the
  * Digiboard PC/Xem driver for Linux.  It is copyright 1992, DIGI 
diff --git a/sys/gnu/i386/isa/dgmreg.h b/sys/gnu/i386/isa/dgmreg.h
index 95fddf846d24b..2f052b530c116 100644
--- a/sys/gnu/i386/isa/dgmreg.h
+++ b/sys/gnu/i386/isa/dgmreg.h
@@ -1,5 +1,5 @@
 /*-
- *  dgmreg.h $Id: dgreg.h,v 1.4.2.1 1996/12/19 14:57:36 davidg Exp $
+ *  dgmreg.h $FreeBSD$
  *
  *  Digiboard driver.
  *
diff --git a/sys/gnu/i386/isa/dgreg.h b/sys/gnu/i386/isa/dgreg.h
index 8b520fb687ed2..73c29624294e0 100644
--- a/sys/gnu/i386/isa/dgreg.h
+++ b/sys/gnu/i386/isa/dgreg.h
@@ -1,5 +1,5 @@
 /*-
- *  dgreg.h $Id: dgreg.h,v 1.7 1997/02/22 09:29:43 peter Exp $
+ *  dgreg.h $FreeBSD$
  *
  *  Digiboard driver.
  *
diff --git a/sys/i386/Makefile b/sys/i386/Makefile
index 28362ba9dc77e..c173c4fb1d714 100644
--- a/sys/i386/Makefile
+++ b/sys/i386/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.5 1998/05/31 22:40:49 steve Exp $
+# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/11/93
 
 # Makefile for i386 links, tags file
diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c
index eb5ed62af635c..a31a36c89cdb7 100644
--- a/sys/i386/apm/apm.c
+++ b/sys/i386/apm/apm.c
@@ -15,7 +15,7 @@
  *
  * Sep, 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id: apm.c,v 1.102 1999/08/22 19:51:33 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c
index eb5ed62af635c..a31a36c89cdb7 100644
--- a/sys/i386/bios/apm.c
+++ b/sys/i386/bios/apm.c
@@ -15,7 +15,7 @@
  *
  * Sep, 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id: apm.c,v 1.102 1999/08/22 19:51:33 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/boot/Makefile b/sys/i386/boot/Makefile
index dc8ad32a5f6a3..3b0adfcc13a51 100644
--- a/sys/i386/boot/Makefile
+++ b/sys/i386/boot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.29 1997/07/10 21:58:43 joerg Exp $
+# $FreeBSD$
 
 SUBDIR=	cdboot dosboot kzipboot netboot rawboot
 
diff --git a/sys/i386/boot/Makefile.inc b/sys/i386/boot/Makefile.inc
index 520458a2126b6..5050c0351094f 100644
--- a/sys/i386/boot/Makefile.inc
+++ b/sys/i386/boot/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.3 1998/12/30 10:05:56 bde Exp $
+# $FreeBSD$
 
 BINDIR?=	/usr/mdec
 CFLAGS+=	-aout
diff --git a/sys/i386/boot/biosboot/Makefile b/sys/i386/boot/biosboot/Makefile
index e4feaf98de984..3139674e074de 100644
--- a/sys/i386/boot/biosboot/Makefile
+++ b/sys/i386/boot/biosboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.67 1998/11/21 21:07:17 ache Exp $
+# $FreeBSD$
 #
 
 PROG=	boot
diff --git a/sys/i386/boot/biosboot/README.386BSD b/sys/i386/boot/biosboot/README.386BSD
index 345c95383628a..3d7c09da59684 100644
--- a/sys/i386/boot/biosboot/README.386BSD
+++ b/sys/i386/boot/biosboot/README.386BSD
@@ -169,4 +169,4 @@ Before you do this ensure you have a booting floppy with correct
 disktab and bootblock files on it so that if it doesn't work, you can
 re-disklabel from the floppy.
 
-$Id: README.386BSD,v 1.9 1997/02/22 09:30:02 peter Exp $
+$FreeBSD$
diff --git a/sys/i386/boot/biosboot/README.MACH b/sys/i386/boot/biosboot/README.MACH
index 5f8b79d7b9d93..73d090a404bd4 100644
--- a/sys/i386/boot/biosboot/README.MACH
+++ b/sys/i386/boot/biosboot/README.MACH
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:33:55  rpd
- *	$Id: README.MACH,v 1.5 1997/02/22 09:30:03 peter Exp $
+ * $FreeBSD$
  */
 
 ********NOTE: This is not all relevant to the 386BSD version**********
diff --git a/sys/i386/boot/biosboot/README.serial b/sys/i386/boot/biosboot/README.serial
index 732e4787e35ce..7edcdeec060c9 100644
--- a/sys/i386/boot/biosboot/README.serial
+++ b/sys/i386/boot/biosboot/README.serial
@@ -193,4 +193,4 @@ CAVEATS:
 	  from the new kernel.
 
 
-$Id: README.serial,v 1.9 1997/06/16 06:32:51 charnier Exp $
+$FreeBSD$
diff --git a/sys/i386/boot/biosboot/asm.S b/sys/i386/boot/biosboot/asm.S
index da01acab1091b..f14c7f55104cc 100644
--- a/sys/i386/boot/biosboot/asm.S
+++ b/sys/i386/boot/biosboot/asm.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:13  rpd
- *	$Id: asm.S,v 1.11 1997/02/22 09:30:04 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/boot/biosboot/asm.h b/sys/i386/boot/biosboot/asm.h
index b90bbcebf158b..6f4bcc39e52d3 100644
--- a/sys/i386/boot/biosboot/asm.h
+++ b/sys/i386/boot/biosboot/asm.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.7  92/02/29  15:33:41  rpd
- *	$Id$
+ * $FreeBSD$
  */
 
 #define S_ARG0	 4(%esp)
diff --git a/sys/i386/boot/biosboot/bios.S b/sys/i386/boot/biosboot/bios.S
index bc80b2f3a9463..30fc76432427a 100644
--- a/sys/i386/boot/biosboot/bios.S
+++ b/sys/i386/boot/biosboot/bios.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- *	$Id: bios.S,v 1.13 1998/08/04 00:39:45 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/boot/biosboot/boot.c b/sys/i386/boot/biosboot/boot.c
index 394f86e82b928..a83c9fdd5c155 100644
--- a/sys/i386/boot/biosboot/boot.c
+++ b/sys/i386/boot/biosboot/boot.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, [92/04/03  16:51:14  rvb]
- *	$Id: boot.c,v 1.73 1998/10/10 14:02:06 bde Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/boot/biosboot/boot.h b/sys/i386/boot/biosboot/boot.h
index e107b471f35e2..d5c413201754f 100644
--- a/sys/i386/boot/biosboot/boot.h
+++ b/sys/i386/boot/biosboot/boot.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:03  rpd
- *	$Id: boot.h,v 1.23 1997/12/04 21:52:42 joerg Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/boot/biosboot/boot2.S b/sys/i386/boot/biosboot/boot2.S
index e199b5f6ed692..1b25853b4e79d 100644
--- a/sys/i386/boot/biosboot/boot2.S
+++ b/sys/i386/boot/biosboot/boot2.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:26  rpd
- *	$Id$
+ * $FreeBSD$
  */
 
 #include	"asm.h"
diff --git a/sys/i386/boot/biosboot/disk.c b/sys/i386/boot/biosboot/disk.c
index 8cd825698b1bb..62fdde42681ae 100644
--- a/sys/i386/boot/biosboot/disk.c
+++ b/sys/i386/boot/biosboot/disk.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:49  rpd
- *	$Id: disk.c,v 1.25 1997/02/22 09:30:09 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/boot/biosboot/io.c b/sys/i386/boot/biosboot/io.c
index b9c40588c46ba..f70516002c15d 100644
--- a/sys/i386/boot/biosboot/io.c
+++ b/sys/i386/boot/biosboot/io.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:57  rpd
- *	$Id: io.c,v 1.24 1997/07/12 10:23:19 joerg Exp $
+ * $FreeBSD$
  */
 
 #include "boot.h"
diff --git a/sys/i386/boot/biosboot/probe_keyboard.c b/sys/i386/boot/biosboot/probe_keyboard.c
index 7856d586a58ff..41d7e9769a3d3 100644
--- a/sys/i386/boot/biosboot/probe_keyboard.c
+++ b/sys/i386/boot/biosboot/probe_keyboard.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: probe_keyboard.c,v 1.13 1997/06/09 05:10:55 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/i386/boot/biosboot/serial.S b/sys/i386/boot/biosboot/serial.S
index 11d63f08272d0..8473d005300b4 100644
--- a/sys/i386/boot/biosboot/serial.S
+++ b/sys/i386/boot/biosboot/serial.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- *	$Id: serial.S,v 1.11 1998/02/01 22:39:24 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/boot/biosboot/start.S b/sys/i386/boot/biosboot/start.S
index 3d27c5fe5f29b..90fac5589d582 100644
--- a/sys/i386/boot/biosboot/start.S
+++ b/sys/i386/boot/biosboot/start.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:29  rpd
- *	$Id: start.S,v 1.11 1998/07/02 15:36:35 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/boot/biosboot/sys.c b/sys/i386/boot/biosboot/sys.c
index 4726f1ec1a1af..289a732cc3ca1 100644
--- a/sys/i386/boot/biosboot/sys.c
+++ b/sys/i386/boot/biosboot/sys.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:34  rpd
- *	$Id: sys.c,v 1.20 1997/05/27 16:26:39 bde Exp $
+ * $FreeBSD$
  */
 
 #include "boot.h"
diff --git a/sys/i386/boot/biosboot/table.c b/sys/i386/boot/biosboot/table.c
index 83ffd1442b239..ac59b24311e3a 100644
--- a/sys/i386/boot/biosboot/table.c
+++ b/sys/i386/boot/biosboot/table.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:43  rpd
- *	$Id: table.c,v 1.18 1999/05/25 09:32:00 brian Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/boot/cdboot/Makefile b/sys/i386/boot/cdboot/Makefile
index b59e851fd870a..1278a287cdce8 100644
--- a/sys/i386/boot/cdboot/Makefile
+++ b/sys/i386/boot/cdboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1998/03/12 12:26:47 bde Exp $
+# $FreeBSD$
 #
 
 PROG=	boot
diff --git a/sys/i386/boot/cdboot/asm.S b/sys/i386/boot/cdboot/asm.S
index e689817466268..2190a35b5f2bd 100644
--- a/sys/i386/boot/cdboot/asm.S
+++ b/sys/i386/boot/cdboot/asm.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:13  rpd
- *	$Id: asm.S,v 1.9 1996/03/08 07:27:52 bde Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/boot/cdboot/boot.c b/sys/i386/boot/cdboot/boot.c
index b89813f666850..bee6b87d06f7a 100644
--- a/sys/i386/boot/cdboot/boot.c
+++ b/sys/i386/boot/cdboot/boot.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, [92/04/03  16:51:14  rvb]
- *	$Id: boot.c,v 1.1 1997/07/11 05:52:37 joerg Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/boot/cdboot/boot.h b/sys/i386/boot/cdboot/boot.h
index 4604c08779374..c0973b33eef32 100644
--- a/sys/i386/boot/cdboot/boot.h
+++ b/sys/i386/boot/cdboot/boot.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:03  rpd
- *	$Id: boot.h,v 1.1 1997/07/11 05:52:38 joerg Exp $
+ * $FreeBSD$
  */
 /*
  * Extensions for El Torito CD-ROM booting:
diff --git a/sys/i386/boot/cdboot/cdrom.c b/sys/i386/boot/cdboot/cdrom.c
index d9555852e7fcc..5668abcf0e570 100644
--- a/sys/i386/boot/cdboot/cdrom.c
+++ b/sys/i386/boot/cdboot/cdrom.c
@@ -27,7 +27,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: cdrom.c,v 1.2 1997/12/02 21:13:59 joerg Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/boot/cdboot/malloc.c b/sys/i386/boot/cdboot/malloc.c
index 2b8486d8aae11..a68e776e456d0 100644
--- a/sys/i386/boot/cdboot/malloc.c
+++ b/sys/i386/boot/cdboot/malloc.c
@@ -27,7 +27,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/boot/dosboot/Makefile b/sys/i386/boot/dosboot/Makefile
index 26c0d0bf04aac..88a25c73a3fc6 100644
--- a/sys/i386/boot/dosboot/Makefile
+++ b/sys/i386/boot/dosboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1997/02/22 09:30:28 peter Exp $
+# $FreeBSD$
 #
 
 MPROG=	fbsdboot.exe
diff --git a/sys/i386/boot/dosboot/ansi.h b/sys/i386/boot/dosboot/ansi.h
index 3a112073c6755..23f6d9ba92aae 100644
--- a/sys/i386/boot/dosboot/ansi.h
+++ b/sys/i386/boot/dosboot/ansi.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ansi.h	7.1 (Berkeley) 3/9/91
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef	_ANSI_H_
diff --git a/sys/i386/boot/dosboot/boot.c b/sys/i386/boot/dosboot/boot.c
index 635781e81827a..0eb6d19203b8b 100644
--- a/sys/i386/boot/dosboot/boot.c
+++ b/sys/i386/boot/dosboot/boot.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, [92/04/03  16:51:14  rvb]
- *	$Id$
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/boot/dosboot/boot.h b/sys/i386/boot/dosboot/boot.h
index c1bd097006625..f72fa1dc7c124 100644
--- a/sys/i386/boot/dosboot/boot.h
+++ b/sys/i386/boot/dosboot/boot.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:03  rpd
- *	$Id$
+ * $FreeBSD$
  */
 
 #include "types.h"
diff --git a/sys/i386/boot/dosboot/bootinfo.h b/sys/i386/boot/dosboot/bootinfo.h
index d1a6fb68412e5..7f56491742336 100644
--- a/sys/i386/boot/dosboot/bootinfo.h
+++ b/sys/i386/boot/dosboot/bootinfo.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef	_MACHINE_BOOTINFO_H_
diff --git a/sys/i386/boot/dosboot/cdefs.h b/sys/i386/boot/dosboot/cdefs.h
index 1b2205fbd5f46..07f727d8e7e38 100644
--- a/sys/i386/boot/dosboot/cdefs.h
+++ b/sys/i386/boot/dosboot/cdefs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *      from: @(#)cdefs.h       8.1 (Berkeley) 6/2/93
- *      $Id$
+ * $FreeBSD$
  */
 
 #ifndef _CDEFS_H_
diff --git a/sys/i386/boot/dosboot/dinode.h b/sys/i386/boot/dosboot/dinode.h
index 6c9fbd42feccb..99a8849b190d0 100644
--- a/sys/i386/boot/dosboot/dinode.h
+++ b/sys/i386/boot/dosboot/dinode.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)dinode.h	7.10 (Berkeley) 5/8/91
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _UFS_DINODE_H_
diff --git a/sys/i386/boot/dosboot/dir.h b/sys/i386/boot/dosboot/dir.h
index 5d9cd1d3613c0..1b72f4749c039 100644
--- a/sys/i386/boot/dosboot/dir.h
+++ b/sys/i386/boot/dosboot/dir.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)dir.h	7.3 (Berkeley) 2/5/91
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/boot/dosboot/disk.c b/sys/i386/boot/dosboot/disk.c
index f990a33a3fb3d..3f93ab82a8586 100644
--- a/sys/i386/boot/dosboot/disk.c
+++ b/sys/i386/boot/dosboot/disk.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:49  rpd
- *	$Id$
+ * $FreeBSD$
  */
 #include <stdio.h>
 #include <memory.h>
diff --git a/sys/i386/boot/dosboot/disklabe.h b/sys/i386/boot/dosboot/disklabe.h
index 81a7c06af6d69..d3983d3c67870 100644
--- a/sys/i386/boot/dosboot/disklabe.h
+++ b/sys/i386/boot/dosboot/disklabe.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.1 (Berkeley) 6/2/93
- * $Id: disklabe.h,v 1.4 1997/02/22 09:30:46 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_DISKLABEL_H_
diff --git a/sys/i386/boot/dosboot/dkbad.h b/sys/i386/boot/dosboot/dkbad.h
index f461d229aab20..1aea5ded055cf 100644
--- a/sys/i386/boot/dosboot/dkbad.h
+++ b/sys/i386/boot/dosboot/dkbad.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dkbad.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_DKBAD_H_
diff --git a/sys/i386/boot/dosboot/endian.h b/sys/i386/boot/dosboot/endian.h
index 1d52a1b419b3d..84d04b25d0086 100644
--- a/sys/i386/boot/dosboot/endian.h
+++ b/sys/i386/boot/dosboot/endian.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)endian.h	7.8 (Berkeley) 4/3/91
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/i386/boot/dosboot/exec.h b/sys/i386/boot/dosboot/exec.h
index 5033235ae74fa..d64f63b77489b 100644
--- a/sys/i386/boot/dosboot/exec.h
+++ b/sys/i386/boot/dosboot/exec.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.3 (Berkeley) 1/21/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_EXEC_H_
diff --git a/sys/i386/boot/dosboot/fs.h b/sys/i386/boot/dosboot/fs.h
index f2c38b4269d57..f4c397d3cac60 100644
--- a/sys/i386/boot/dosboot/fs.h
+++ b/sys/i386/boot/dosboot/fs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)fs.h	7.12 (Berkeley) 5/8/91
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _UFS_FS_H_
diff --git a/sys/i386/boot/dosboot/imgact.h b/sys/i386/boot/dosboot/imgact.h
index f9cc403977e6f..f3ec5571819cd 100644
--- a/sys/i386/boot/dosboot/imgact.h
+++ b/sys/i386/boot/dosboot/imgact.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)exec.h	8.1 (Berkeley) 6/11/93
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef	_IMGACT_AOUT_H_
diff --git a/sys/i386/boot/dosboot/inode.h b/sys/i386/boot/dosboot/inode.h
index 0a692e3cfbeb9..26ae12090e082 100644
--- a/sys/i386/boot/dosboot/inode.h
+++ b/sys/i386/boot/dosboot/inode.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)inode.h	7.17 (Berkeley) 5/8/91
- *	$Id: inode.h,v 1.4 1997/02/22 09:30:56 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_INODE_H_
diff --git a/sys/i386/boot/dosboot/mexec.h b/sys/i386/boot/dosboot/mexec.h
index e978510b9b768..b045a235ece3a 100644
--- a/sys/i386/boot/dosboot/mexec.h
+++ b/sys/i386/boot/dosboot/mexec.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.1 (Berkeley) 6/11/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_EXEC_H_
diff --git a/sys/i386/boot/dosboot/param.h b/sys/i386/boot/dosboot/param.h
index 61a82419b1080..394c1f797d7e8 100644
--- a/sys/i386/boot/dosboot/param.h
+++ b/sys/i386/boot/dosboot/param.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PARAM_H_
diff --git a/sys/i386/boot/dosboot/quota.h b/sys/i386/boot/dosboot/quota.h
index 425066e91d88e..5ad06ce018bb1 100644
--- a/sys/i386/boot/dosboot/quota.h
+++ b/sys/i386/boot/dosboot/quota.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)quota.h	7.9 (Berkeley) 2/22/91
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _QUOTA_
diff --git a/sys/i386/boot/dosboot/reboot.h b/sys/i386/boot/dosboot/reboot.h
index f0dcfd244a79e..65453b05e51f8 100644
--- a/sys/i386/boot/dosboot/reboot.h
+++ b/sys/i386/boot/dosboot/reboot.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)reboot.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_REBOOT_H_
diff --git a/sys/i386/boot/dosboot/sys.c b/sys/i386/boot/dosboot/sys.c
index f9d2f9be9a089..04a25af8d9075 100644
--- a/sys/i386/boot/dosboot/sys.c
+++ b/sys/i386/boot/dosboot/sys.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:34  rpd
- *	$Id$
+ * $FreeBSD$
  */
 #include <stdio.h>
 #include <string.h>
diff --git a/sys/i386/boot/dosboot/syslimit.h b/sys/i386/boot/dosboot/syslimit.h
index 3d691b7cbc08c..0d914230c3b68 100644
--- a/sys/i386/boot/dosboot/syslimit.h
+++ b/sys/i386/boot/dosboot/syslimit.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)syslimits.h	7.4 (Berkeley) 2/4/91
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_SYSLIMITS_H_
diff --git a/sys/i386/boot/dosboot/sysparam.h b/sys/i386/boot/dosboot/sysparam.h
index a9a5f35aabb92..4f93f2cc02667 100644
--- a/sys/i386/boot/dosboot/sysparam.h
+++ b/sys/i386/boot/dosboot/sysparam.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.2 (Berkeley) 1/21/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_PARAM_H_
diff --git a/sys/i386/boot/dosboot/types.h b/sys/i386/boot/dosboot/types.h
index ee013c0532026..85b64942897a7 100644
--- a/sys/i386/boot/dosboot/types.h
+++ b/sys/i386/boot/dosboot/types.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)types.h	8.4 (Berkeley) 1/21/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_TYPES_H_
diff --git a/sys/i386/boot/kzipboot/Makefile b/sys/i386/boot/kzipboot/Makefile
index c1dc06009dad9..1c37ac40cae6b 100644
--- a/sys/i386/boot/kzipboot/Makefile
+++ b/sys/i386/boot/kzipboot/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.9 1998/05/27 08:06:33 sos Exp $
+# $FreeBSD$
 
 PROG= kztail.o kzhead.o
 BINMODE = 444	# target is a relocatable object
diff --git a/sys/i386/boot/netboot/3c509.c b/sys/i386/boot/netboot/3c509.c
index adf721c3ec19d..accc948c6b4f6 100644
--- a/sys/i386/boot/netboot/3c509.c
+++ b/sys/i386/boot/netboot/3c509.c
@@ -18,7 +18,7 @@ Author: Martin Renters.
 
 3c509 support added by Serge Babkin (babkin@hq.icb.chel.su)
 
-$Id$
+$FreeBSD$
 
 ***************************************************************************/
 
diff --git a/sys/i386/boot/netboot/Makefile b/sys/i386/boot/netboot/Makefile
index 2d50c65a58e76..84d3d97103e16 100644
--- a/sys/i386/boot/netboot/Makefile
+++ b/sys/i386/boot/netboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.21 1998/11/28 08:03:24 joerg Exp $
+# $FreeBSD$
 #
 # Makefile for NETBOOT
 #
diff --git a/sys/i386/boot/netboot/netboot.8 b/sys/i386/boot/netboot/netboot.8
index 094d47fda4ec2..2717ec53cc0db 100644
--- a/sys/i386/boot/netboot/netboot.8
+++ b/sys/i386/boot/netboot/netboot.8
@@ -1,4 +1,4 @@
-.\"	$Id: netboot.8,v 1.3 1997/05/31 18:29:58 tegge Exp $
+.\" $FreeBSD$
 .Dd May 15, 1997
 .Dt NETBOOT 8
 .\".Os BSD 4
diff --git a/sys/i386/boot/rawboot/Makefile b/sys/i386/boot/rawboot/Makefile
index 061b6959ecf76..474788b2c88c2 100644
--- a/sys/i386/boot/rawboot/Makefile
+++ b/sys/i386/boot/rawboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.11 1998/03/12 12:26:49 bde Exp $
+# $FreeBSD$
 #
 
 PROG=	boot
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index f889546e112f9..2011cfea73e63 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -15,7 +15,7 @@
 # device lines is also present in the ./LINT configuration file. If you are
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.182 1999/08/15 09:54:56 phk Exp $
+# $FreeBSD$
 
 machine		i386
 cpu		I386_CPU
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 80ecf1a81a2b8..6c0f0cf935d3b 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.629 1999/08/21 17:40:37 wpaul Exp $
+# $FreeBSD$
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
index 66873d0cc1e97..0d82e7971baa8 100644
--- a/sys/i386/conf/Makefile.i386
+++ b/sys/i386/conf/Makefile.i386
@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.i386,v 1.157 1999/07/02 04:00:01 jkh Exp $
+# $FreeBSD$
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 80ecf1a81a2b8..6c0f0cf935d3b 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.629 1999/08/21 17:40:37 wpaul Exp $
+# $FreeBSD$
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
diff --git a/sys/i386/conf/PCCARD b/sys/i386/conf/PCCARD
index 3f57f717949d7..7dfbfab756354 100644
--- a/sys/i386/conf/PCCARD
+++ b/sys/i386/conf/PCCARD
@@ -12,7 +12,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: PCCARD,v 1.16 1999/08/15 09:38:20 phk Exp $
+# $FreeBSD$
 
 machine		i386
 cpu		I386_CPU
diff --git a/sys/i386/conf/devices.i386 b/sys/i386/conf/devices.i386
index ed921de75a0ec..0e3045546c933 100644
--- a/sys/i386/conf/devices.i386
+++ b/sys/i386/conf/devices.i386
@@ -1,6 +1,6 @@
 # This file tells what major numbers the various possible swap devices have.
 #
-#	$Id: devices.i386,v 1.15 1998/12/27 13:55:48 sos Exp $
+# $FreeBSD$
 #
 wd	0
 wfd	1
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
index 72349659ad1db..e6a940c18e111 100644
--- a/sys/i386/conf/files.i386
+++ b/sys/i386/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.259 1999/08/18 04:08:14 alc Exp $
+# $FreeBSD$
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/i386/conf/majors.i386 b/sys/i386/conf/majors.i386
index 60feb64f5cf15..e4fda55c344f2 100644
--- a/sys/i386/conf/majors.i386
+++ b/sys/i386/conf/majors.i386
@@ -1,4 +1,4 @@
-$Id: majors.i386,v 1.81 1999/08/04 19:55:37 jkh Exp $
+$FreeBSD$
 
 Hopefully, this list will one day be obsoleted by DEVFS, but for now
 this is the current allocation of device major numbers.
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index bd3ac0e5ddbe2..f0adfd96ab8fa 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.119 1999/08/06 14:01:55 hm Exp $
+# $FreeBSD$
 
 DISABLE_PSE
 IDE_DELAY
diff --git a/sys/i386/eisa/3c5x9.c b/sys/i386/eisa/3c5x9.c
index b6ccff13af419..663409d4b75a6 100644
--- a/sys/i386/eisa/3c5x9.c
+++ b/sys/i386/eisa/3c5x9.c
@@ -19,7 +19,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: 3c5x9.c,v 1.12 1999/05/08 21:59:15 dfr Exp $
+ * $FreeBSD$
  */
 
 #include "eisa.h"
diff --git a/sys/i386/eisa/adv_eisa.c b/sys/i386/eisa/adv_eisa.c
index 4b475d3d11938..ad9604e69626c 100644
--- a/sys/i386/eisa/adv_eisa.c
+++ b/sys/i386/eisa/adv_eisa.c
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: adv_eisa.c,v 1.5 1999/08/01 22:57:08 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include "eisa.h"
diff --git a/sys/i386/eisa/ahb.c b/sys/i386/eisa/ahb.c
index a1dc84ac5e7ad..67eead4dd7e21 100644
--- a/sys/i386/eisa/ahb.c
+++ b/sys/i386/eisa/ahb.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ahb.c,v 1.13 1999/08/01 22:57:08 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include "eisa.h"
diff --git a/sys/i386/eisa/ahbreg.h b/sys/i386/eisa/ahbreg.h
index 1bed89ebff4a5..c72f068aa3b9d 100644
--- a/sys/i386/eisa/ahbreg.h
+++ b/sys/i386/eisa/ahbreg.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /* Resource Constatns */
diff --git a/sys/i386/eisa/ahc_eisa.c b/sys/i386/eisa/ahc_eisa.c
index 39450187d3a6f..e98be7d3a3d5d 100644
--- a/sys/i386/eisa/ahc_eisa.c
+++ b/sys/i386/eisa/ahc_eisa.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ahc_eisa.c,v 1.11 1999/08/01 22:57:08 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include "eisa.h"
diff --git a/sys/i386/eisa/bt_eisa.c b/sys/i386/eisa/bt_eisa.c
index d9cb5840438c6..400b42b046f75 100644
--- a/sys/i386/eisa/bt_eisa.c
+++ b/sys/i386/eisa/bt_eisa.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bt_eisa.c,v 1.8 1999/08/01 22:57:08 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include "eisa.h"
diff --git a/sys/i386/eisa/dpt_eisa.c b/sys/i386/eisa/dpt_eisa.c
index caeab91f30287..8518214db90b3 100644
--- a/sys/i386/eisa/dpt_eisa.c
+++ b/sys/i386/eisa/dpt_eisa.c
@@ -33,7 +33,7 @@
  */
 
 /*
- * $Id: dpt_eisa.c,v 1.7 1999/08/01 22:57:09 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include "eisa.h"
diff --git a/sys/i386/eisa/dpt_eisa.h b/sys/i386/eisa/dpt_eisa.h
index 0731911d36cb6..683ff655953c0 100644
--- a/sys/i386/eisa/dpt_eisa.h
+++ b/sys/i386/eisa/dpt_eisa.h
@@ -32,7 +32,7 @@
  */
 
 /*
- * $Id: dpt_eisa.h,v 1.2 1998/09/15 08:33:35 gibbs Exp $
+ * $FreeBSD$
  */
 
 #define DPT_EISA_SLOT_OFFSET		0xc00
diff --git a/sys/i386/eisa/eisaconf.c b/sys/i386/eisa/eisaconf.c
index 1aeb1df1af974..869ebbe6cabc5 100644
--- a/sys/i386/eisa/eisaconf.c
+++ b/sys/i386/eisa/eisaconf.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: eisaconf.c,v 1.50 1999/08/01 22:57:09 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include "opt_eisa.h"
diff --git a/sys/i386/eisa/eisaconf.h b/sys/i386/eisa/eisaconf.h
index 6174b6b369266..8330bb4a7353b 100644
--- a/sys/i386/eisa/eisaconf.h
+++ b/sys/i386/eisa/eisaconf.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: eisaconf.h,v 1.18 1999/04/18 15:50:33 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_EISA_EISACONF_H_
diff --git a/sys/i386/eisa/if_fea.c b/sys/i386/eisa/if_fea.c
index c98eb4bf96af3..21c90d4a7dd68 100644
--- a/sys/i386/eisa/if_fea.c
+++ b/sys/i386/eisa/if_fea.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_fea.c,v 1.16 1999/07/31 00:43:48 mdodd Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/apic_vector.s b/sys/i386/i386/apic_vector.s
index 6a7bcf059a121..f484971eab2bb 100644
--- a/sys/i386/i386/apic_vector.s
+++ b/sys/i386/i386/apic_vector.s
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: apic_vector.s,v 1.43 1999/07/20 06:52:35 msmith Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/i386/atomic.c b/sys/i386/i386/atomic.c
index d7a5c495d6dfd..c19ba9e027b2b 100644
--- a/sys/i386/i386/atomic.c
+++ b/sys/i386/i386/atomic.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /* This file creates publically callable functions to perform various
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index 4c5dbd34bb5ba..f678609719d0c 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$Id: autoconf.c,v 1.136 1999/08/22 23:49:00 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/bios.c b/sys/i386/i386/bios.c
index baf20187da6cf..5fc0a4296738a 100644
--- a/sys/i386/i386/bios.c
+++ b/sys/i386/i386/bios.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: bios.c,v 1.21 1999/08/25 06:56:36 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/bioscall.s b/sys/i386/i386/bioscall.s
index 3d95a6278dd2d..8ecee477fa5ac 100644
--- a/sys/i386/i386/bioscall.s
+++ b/sys/i386/i386/bioscall.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: bioscall.s,v 1.4 1999/08/25 06:44:32 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/busdma_machdep.c b/sys/i386/i386/busdma_machdep.c
index bebec68ceca15..c16333ced1100 100644
--- a/sys/i386/i386/busdma_machdep.c
+++ b/sys/i386/i386/busdma_machdep.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: busdma_machdep.c,v 1.13 1999/07/02 05:12:11 mjacob Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/db_disasm.c b/sys/i386/i386/db_disasm.c
index b3b30b13f3f50..16e8106d5e738 100644
--- a/sys/i386/i386/db_disasm.c
+++ b/sys/i386/i386/db_disasm.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_disasm.c,v 1.21 1998/07/08 10:53:56 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/db_interface.c b/sys/i386/i386/db_interface.c
index 0ad6dfbfd56a9..cb7f228d671ad 100644
--- a/sys/i386/i386/db_interface.c
+++ b/sys/i386/i386/db_interface.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_interface.c,v 1.44 1999/04/28 01:03:17 luoqi Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/db_trace.c b/sys/i386/i386/db_trace.c
index 6a361a0052f91..074b4e639bcb2 100644
--- a/sys/i386/i386/db_trace.c
+++ b/sys/i386/i386/db_trace.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_trace.c,v 1.33 1999/01/28 01:59:50 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/elf_machdep.c b/sys/i386/i386/elf_machdep.c
index 2814f066e0f0a..51a2e77541f68 100644
--- a/sys/i386/i386/elf_machdep.c
+++ b/sys/i386/i386/elf_machdep.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $Id: elf_machdep.c,v 1.4 1998/12/07 21:58:18 archie Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/exception.s b/sys/i386/i386/exception.s
index dce98e87e5b67..f19622475bb8e 100644
--- a/sys/i386/i386/exception.s
+++ b/sys/i386/i386/exception.s
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: exception.s,v 1.62 1999/06/27 21:31:43 alc Exp $
+ * $FreeBSD$
  */
 
 #include "npx.h"
diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c
index 9f17b0c7d6169..2df5182682169 100644
--- a/sys/i386/i386/genassym.c
+++ b/sys/i386/i386/genassym.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$Id: genassym.c,v 1.75 1999/07/29 08:33:00 peter Exp $
+ * $FreeBSD$
  */
 
 #include "opt_user_ldt.h"
diff --git a/sys/i386/i386/globals.s b/sys/i386/i386/globals.s
index 574220aade844..8a46b522cc7c2 100644
--- a/sys/i386/i386/globals.s
+++ b/sys/i386/i386/globals.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: globals.s,v 1.11 1999/05/12 21:38:41 luoqi Exp $
+ * $FreeBSD$
  */
 
 #include "opt_user_ldt.h"
diff --git a/sys/i386/i386/i686_mem.c b/sys/i386/i386/i686_mem.c
index d971aa95f02e5..33342b92227c8 100644
--- a/sys/i386/i386/i686_mem.c
+++ b/sys/i386/i386/i686_mem.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: i686_mem.c,v 1.4 1999/07/20 06:58:51 msmith Exp $
+ * $FreeBSD$
  */
 
 #include "opt_smp.h"
diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c
index ba53f4eab87b2..0f1e86d677372 100644
--- a/sys/i386/i386/identcpu.c
+++ b/sys/i386/i386/identcpu.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp
- *	$Id: identcpu.c,v 1.71 1999/07/06 13:23:56 peter Exp $
+ * $FreeBSD$
  */
 
 #include "opt_cpu.h"
diff --git a/sys/i386/i386/in_cksum.c b/sys/i386/i386/in_cksum.c
index e9244fbe20664..481a390393ecb 100644
--- a/sys/i386/i386/in_cksum.c
+++ b/sys/i386/i386/in_cksum.c
@@ -32,7 +32,7 @@
  *
  *	from tahoe:	in_cksum.c	1.2	86/01/05
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
- *	$Id: in_cksum.c,v 1.14 1999/01/28 01:59:50 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/initcpu.c b/sys/i386/i386/initcpu.c
index a58caadce1b40..a56bb36d91a56 100644
--- a/sys/i386/i386/initcpu.c
+++ b/sys/i386/i386/initcpu.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *		$Id: initcpu.c,v 1.17 1999/01/16 13:41:33 kato Exp $
+ * $FreeBSD$
  */
 
 #include "opt_cpu.h"
diff --git a/sys/i386/i386/k6_mem.c b/sys/i386/i386/k6_mem.c
index b28691bacde91..1045b28c9f778 100644
--- a/sys/i386/i386/k6_mem.c
+++ b/sys/i386/i386/k6_mem.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: k6_mem.c,v 1.1 1999/06/18 19:56:02 green Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/i386/legacy.c b/sys/i386/i386/legacy.c
index 0c28185a347b8..22e98eda71063 100644
--- a/sys/i386/i386/legacy.c
+++ b/sys/i386/i386/legacy.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: nexus.c,v 1.15 1999/08/23 19:23:33 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s
index 95b55613bf47d..f2627266353c2 100644
--- a/sys/i386/i386/locore.s
+++ b/sys/i386/i386/locore.s
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
- *	$Id: locore.s,v 1.124 1999/06/18 14:32:13 bde Exp $
+ * $FreeBSD$
  *
  *		originally from: locore.s, by William F. Jolitz
  *
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index dfde63760a871..a3c33bfc293ab 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.358 1999/08/09 10:34:43 phk Exp $
+ * $FreeBSD$
  */
 
 #include "apm.h"
diff --git a/sys/i386/i386/math_emu.h b/sys/i386/i386/math_emu.h
index b996e5d78be83..6e189b4a55944 100644
--- a/sys/i386/i386/math_emu.h
+++ b/sys/i386/i386/math_emu.h
@@ -3,7 +3,7 @@
  *
  * (C) 1991 Linus Torvalds
  *
- *	$Id: math_emu.h,v 1.5 1997/02/22 09:32:27 peter Exp $
+ * $FreeBSD$
  */
 #ifndef _LINUX_MATH_EMU_H
 #define _LINUX_MATH_EMU_H
diff --git a/sys/i386/i386/math_emulate.c b/sys/i386/i386/math_emulate.c
index 7f93e4b6f6f95..ec7e216d0b403 100644
--- a/sys/i386/i386/math_emulate.c
+++ b/sys/i386/i386/math_emulate.c
@@ -6,7 +6,7 @@
  * [expediant "port" of linux 8087 emulator to 386BSD, with apologies -wfj]
  *
  *	from: 386BSD 0.1
- *	$Id: math_emulate.c,v 1.33 1999/01/28 01:59:50 dillon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index c835a6ee2ccef..ab31e7095ea37 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -38,7 +38,7 @@
  *
  *	from: Utah $Hdr: mem.c 1.13 89/10/08$
  *	from: @(#)mem.c	7.2 (Berkeley) 5/9/91
- *	$Id: mem.c,v 1.64 1999/08/23 20:58:38 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index 969cd0892495d..283ed1701a3cc 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.106 1999/07/20 06:52:26 msmith Exp $
+ * $FreeBSD$
  */
 
 #include "opt_smp.h"
diff --git a/sys/i386/i386/mpapic.c b/sys/i386/i386/mpapic.c
index 8ae685485f43a..ef591aa7b51dc 100644
--- a/sys/i386/i386/mpapic.c
+++ b/sys/i386/i386/mpapic.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mpapic.c,v 1.32 1998/09/06 22:41:40 tegge Exp $
+ * $FreeBSD$
  */
 
 #include "opt_smp.h"
diff --git a/sys/i386/i386/mpboot.s b/sys/i386/i386/mpboot.s
index 962bafcc77922..d21354e3c793b 100644
--- a/sys/i386/i386/mpboot.s
+++ b/sys/i386/i386/mpboot.s
@@ -31,7 +31,7 @@
  * mpboot.s:	FreeBSD machine support for the Intel MP Spec
  *		multiprocessor systems.
  *
- *	$Id: mpboot.s,v 1.10 1999/04/28 01:03:22 luoqi Exp $
+ * $FreeBSD$
  */
 
 #include <machine/asmacros.h>		/* miscellaneous asm macros */
diff --git a/sys/i386/i386/mplock.s b/sys/i386/i386/mplock.s
index fe8281dc50f62..bb1a4bf2a86d8 100644
--- a/sys/i386/i386/mplock.s
+++ b/sys/i386/i386/mplock.s
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: mplock.s,v 1.24 1998/05/17 23:08:04 tegge Exp $
+ * $FreeBSD$
  *
  * Functions for locking between CPUs in a SMP system.
  *
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index 969cd0892495d..283ed1701a3cc 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.106 1999/07/20 06:52:26 msmith Exp $
+ * $FreeBSD$
  */
 
 #include "opt_smp.h"
diff --git a/sys/i386/i386/nexus.c b/sys/i386/i386/nexus.c
index 0c28185a347b8..22e98eda71063 100644
--- a/sys/i386/i386/nexus.c
+++ b/sys/i386/i386/nexus.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: nexus.c,v 1.15 1999/08/23 19:23:33 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/perfmon.c b/sys/i386/i386/perfmon.c
index b8bd5958c13d4..60775d1329d74 100644
--- a/sys/i386/i386/perfmon.c
+++ b/sys/i386/i386/perfmon.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: perfmon.c,v 1.18 1999/05/11 01:54:52 alc Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 791060a03f8c5..6129ed86f48fe 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.245 1999/08/10 04:10:57 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/procfs_machdep.c b/sys/i386/i386/procfs_machdep.c
index b0f8e3cda6e23..6d48081e4d012 100644
--- a/sys/i386/i386/procfs_machdep.c
+++ b/sys/i386/i386/procfs_machdep.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_machdep.c	8.3 (Berkeley) 1/27/94
  *
  * From:
- *	$Id: procfs_machdep.c,v 1.11 1998/09/14 22:43:33 jdp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/simplelock.s b/sys/i386/i386/simplelock.s
index 4442500ef80b8..9abc3b74660a6 100644
--- a/sys/i386/i386/simplelock.s
+++ b/sys/i386/i386/simplelock.s
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: simplelock.s,v 1.9 1998/05/17 23:08:03 tegge Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/support.s b/sys/i386/i386/support.s
index 7093dbb86df45..ae99af947ab8d 100644
--- a/sys/i386/i386/support.s
+++ b/sys/i386/i386/support.s
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: support.s,v 1.62 1999/03/30 09:00:40 phk Exp $
+ * $FreeBSD$
  */
 
 #include "opt_smp.h"
diff --git a/sys/i386/i386/swtch.s b/sys/i386/i386/swtch.s
index fb6c1ff93688a..ee277419c3602 100644
--- a/sys/i386/i386/swtch.s
+++ b/sys/i386/i386/swtch.s
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swtch.s,v 1.85 1999/07/10 15:27:55 bde Exp $
+ * $FreeBSD$
  */
 
 #include "npx.h"
diff --git a/sys/i386/i386/symbols.raw b/sys/i386/i386/symbols.raw
index 943d8ae860c41..0641f66579781 100644
--- a/sys/i386/i386/symbols.raw
+++ b/sys/i386/i386/symbols.raw
@@ -1,6 +1,6 @@
 #	@(#)symbols.raw	7.6 (Berkeley) 5/8/91
 #
-#	$Id: symbols.raw,v 1.13 1998/09/15 10:03:43 gibbs Exp $
+# $FreeBSD$
 #
 
 
diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c
index 76b45ff8c3297..0f5930ca7a0ac 100644
--- a/sys/i386/i386/sys_machdep.c
+++ b/sys/i386/i386/sys_machdep.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sys_machdep.c	5.5 (Berkeley) 1/19/91
- *	$Id: sys_machdep.c,v 1.41 1999/04/28 01:03:25 luoqi Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index e717563e7ed57..5e3ed49ee48af 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.139 1999/06/18 14:32:16 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c
index 188e20bc0f474..8a3e1c93030c8 100644
--- a/sys/i386/i386/tsc.c
+++ b/sys/i386/i386/tsc.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.142 1999/07/29 01:20:47 green Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c
index 2a0f13624b285..09e31cb980b10 100644
--- a/sys/i386/i386/userconfig.c
+++ b/sys/i386/i386/userconfig.c
@@ -46,7 +46,7 @@
  ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  **
- **      $Id: userconfig.c,v 1.152 1999/08/09 13:52:12 mpp Exp $
+ ** $FreeBSD$
  **/
 
 /**
@@ -2545,7 +2545,7 @@ visuserconfig(void)
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: userconfig.c,v 1.152 1999/08/09 13:52:12 mpp Exp $
+ * $FreeBSD$
  */
 
 #include "scbus.h"
diff --git a/sys/i386/i386/vm86.c b/sys/i386/i386/vm86.c
index 43d8cff9dfd80..b50b6f18d5737 100644
--- a/sys/i386/i386/vm86.c
+++ b/sys/i386/i386/vm86.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: vm86.c,v 1.26 1999/06/01 18:19:48 jlemon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/i386/vm86bios.s b/sys/i386/i386/vm86bios.s
index b81116f06df7c..7781481764918 100644
--- a/sys/i386/i386/vm86bios.s
+++ b/sys/i386/i386/vm86bios.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: vm86bios.s,v 1.13 1999/05/12 21:38:46 luoqi Exp $
+ * $FreeBSD$
  */
 
 #include <machine/asmacros.h>		/* miscellaneous asm macros */
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index 21bc706129cee..b907f27c034c1 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -38,7 +38,7 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.124 1999/07/22 06:04:01 alc Exp $
+ * $FreeBSD$
  */
 
 #include "npx.h"
diff --git a/sys/i386/ibcs2/Makefile b/sys/i386/ibcs2/Makefile
index 99d779e07ad57..f90560ee821e0 100644
--- a/sys/i386/ibcs2/Makefile
+++ b/sys/i386/ibcs2/Makefile
@@ -1,6 +1,6 @@
 # Makefile for syscall tables
 #
-# $Id$
+# $FreeBSD$
 
 all:
 	@echo "make ibcs2_sysent.c, ibcs2_isc_sysent.c or ibcs2_xenix_sysent.c only"
diff --git a/sys/i386/ibcs2/coff.h b/sys/i386/ibcs2/coff.h
index c4868fcfdacd2..a0eecd97ba955 100644
--- a/sys/i386/ibcs2/coff.h
+++ b/sys/i386/ibcs2/coff.h
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _COFF_H
diff --git a/sys/i386/ibcs2/ibcs2_fcntl.c b/sys/i386/ibcs2/ibcs2_fcntl.c
index 436489263ca39..5cc637a92cd80 100644
--- a/sys/i386/ibcs2/ibcs2_fcntl.c
+++ b/sys/i386/ibcs2/ibcs2_fcntl.c
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ibcs2_fcntl.c,v 1.11 1998/02/04 04:12:28 eivind Exp $
+ * $FreeBSD$
  */
 
 #include "opt_spx_hack.h"
diff --git a/sys/i386/ibcs2/ibcs2_ipc.c b/sys/i386/ibcs2/ibcs2_ipc.c
index d2ebfa85f1763..2acf3d2bbd607 100644
--- a/sys/i386/ibcs2/ibcs2_ipc.c
+++ b/sys/i386/ibcs2/ibcs2_ipc.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ibcs2_ipc.c,v 1.13 1997/11/06 19:28:28 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/ibcs2/ibcs2_ipc.h b/sys/i386/ibcs2/ibcs2_ipc.h
index 664920bfa31f9..bee650f76658f 100644
--- a/sys/i386/ibcs2/ibcs2_ipc.h
+++ b/sys/i386/ibcs2/ibcs2_ipc.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ibcs2_ipc.h,v 1.4 1999/02/07 19:35:40 guido Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/ibcs2/ibcs2_isc.c b/sys/i386/ibcs2/ibcs2_isc.c
index 89841418052e9..bc268b6ac8eac 100644
--- a/sys/i386/ibcs2/ibcs2_isc.c
+++ b/sys/i386/ibcs2/ibcs2_isc.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ibcs2_isc.c,v 1.10 1997/07/20 09:39:43 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c
index aff36c81c303e..cea6b15ddd445 100644
--- a/sys/i386/ibcs2/ibcs2_misc.c
+++ b/sys/i386/ibcs2/ibcs2_misc.c
@@ -45,7 +45,7 @@
  *
  *	@(#)sun_misc.c	8.1 (Berkeley) 6/18/93
  *
- * $Id: ibcs2_misc.c,v 1.31 1999/01/28 01:59:52 dillon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/ibcs2/ibcs2_msg.c b/sys/i386/ibcs2/ibcs2_msg.c
index 8b7429b1edc24..6c36cf85540e0 100644
--- a/sys/i386/ibcs2/ibcs2_msg.c
+++ b/sys/i386/ibcs2/ibcs2_msg.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ibcs2_msg.c,v 1.5 1997/11/06 19:28:34 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/ibcs2/ibcs2_other.c b/sys/i386/ibcs2/ibcs2_other.c
index cabb184b33c2a..3578b3a07e5d6 100644
--- a/sys/i386/ibcs2/ibcs2_other.c
+++ b/sys/i386/ibcs2/ibcs2_other.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ibcs2_other.c,v 1.8 1997/11/06 19:28:35 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/ibcs2/ibcs2_poll.h b/sys/i386/ibcs2/ibcs2_poll.h
index d04fce1bc453b..6bd86ced28fd1 100644
--- a/sys/i386/ibcs2/ibcs2_poll.h
+++ b/sys/i386/ibcs2/ibcs2_poll.h
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/ibcs2/ibcs2_signal.c b/sys/i386/ibcs2/ibcs2_signal.c
index 7770896ed3d85..fa111fa88f50a 100644
--- a/sys/i386/ibcs2/ibcs2_signal.c
+++ b/sys/i386/ibcs2/ibcs2_signal.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ibcs2_signal.c,v 1.12 1997/11/06 19:28:38 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/ibcs2/ibcs2_sysvec.c b/sys/i386/ibcs2/ibcs2_sysvec.c
index a9a25fd666fe7..bed71d6fb9fb6 100644
--- a/sys/i386/ibcs2/ibcs2_sysvec.c
+++ b/sys/i386/ibcs2/ibcs2_sysvec.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ibcs2_sysvec.c,v 1.14 1999/02/04 21:21:38 newton Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/ibcs2/ibcs2_xenix.c b/sys/i386/ibcs2/ibcs2_xenix.c
index 89506bfced4ed..67af2fcfdd5c1 100644
--- a/sys/i386/ibcs2/ibcs2_xenix.c
+++ b/sys/i386/ibcs2/ibcs2_xenix.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ibcs2_xenix.c,v 1.17 1998/12/04 22:54:46 archie Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c
index 3c70d00588515..5c0b316dacdd4 100644
--- a/sys/i386/ibcs2/imgact_coff.c
+++ b/sys/i386/ibcs2/imgact_coff.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: imgact_coff.c,v 1.35 1999/01/28 01:59:52 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/ibcs2/syscalls.conf b/sys/i386/ibcs2/syscalls.conf
index ebdaa97f63b85..f000929cc5b2f 100644
--- a/sys/i386/ibcs2/syscalls.conf
+++ b/sys/i386/ibcs2/syscalls.conf
@@ -1,4 +1,4 @@
-#	syscalls.conf  $Id: syscalls.conf,v 1.4 1997/02/22 09:33:32 peter Exp $
+#	syscalls.conf $FreeBSD$
 sysnames="/dev/null"
 sysproto="ibcs2_proto.h"
 sysproto_h=_IBCS2_SYSPROTO_H_
diff --git a/sys/i386/ibcs2/syscalls.isc b/sys/i386/ibcs2/syscalls.isc
index d8806bf1c4504..883374875c56a 100644
--- a/sys/i386/ibcs2/syscalls.isc
+++ b/sys/i386/ibcs2/syscalls.isc
@@ -1,4 +1,4 @@
-	$Id: syscalls.isc,v 1.3 1997/02/22 09:33:35 peter Exp $
+ $FreeBSD$
 
 #include <sys/param.h>
 #include <sys/sysent.h>
diff --git a/sys/i386/ibcs2/syscalls.isc.conf b/sys/i386/ibcs2/syscalls.isc.conf
index 90e30ff70cd0b..b9a3e554ead5e 100644
--- a/sys/i386/ibcs2/syscalls.isc.conf
+++ b/sys/i386/ibcs2/syscalls.isc.conf
@@ -1,4 +1,4 @@
-#	syscalls.conf  $Id: syscalls.isc.conf,v 1.3 1997/02/22 09:33:37 peter Exp $
+#	syscalls.conf $FreeBSD$
 sysnames="/dev/null"
 #sysproto="ibcs2_isc.h"
 sysproto="/dev/null"
diff --git a/sys/i386/ibcs2/syscalls.master b/sys/i386/ibcs2/syscalls.master
index ed3388c47600d..ccbdf1f86ba78 100644
--- a/sys/i386/ibcs2/syscalls.master
+++ b/sys/i386/ibcs2/syscalls.master
@@ -1,4 +1,4 @@
-	$Id: syscalls.master,v 1.7 1997/02/22 09:33:38 peter Exp $
+ $FreeBSD$
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; System call name/number master file (or rather, slave, from IBCS2).
diff --git a/sys/i386/ibcs2/syscalls.xenix b/sys/i386/ibcs2/syscalls.xenix
index d8efc1ec8857a..61182e6a34fc3 100644
--- a/sys/i386/ibcs2/syscalls.xenix
+++ b/sys/i386/ibcs2/syscalls.xenix
@@ -1,4 +1,4 @@
-	$Id: syscalls.xenix,v 1.4 1997/02/22 09:33:39 peter Exp $
+ $FreeBSD$
 
 #include <sys/param.h>
 #include <sys/sysent.h>
diff --git a/sys/i386/ibcs2/syscalls.xenix.conf b/sys/i386/ibcs2/syscalls.xenix.conf
index 4b4af8b76ef4a..18469ec7834c9 100644
--- a/sys/i386/ibcs2/syscalls.xenix.conf
+++ b/sys/i386/ibcs2/syscalls.xenix.conf
@@ -1,4 +1,4 @@
-#	syscalls.conf  $Id: syscalls.xenix.conf,v 1.3 1997/02/22 09:33:40 peter Exp $
+#	syscalls.conf $FreeBSD$
 sysnames="/dev/null"
 sysproto="ibcs2_xenix.h"
 sysproto_h=_IBCS2_XENIX_H_
diff --git a/sys/i386/include/_limits.h b/sys/i386/include/_limits.h
index fe6041b4c4b7e..0d258ff9d94c3 100644
--- a/sys/i386/include/_limits.h
+++ b/sys/i386/include/_limits.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $Id: limits.h,v 1.12 1999/05/20 23:33:35 ache Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/i386/include/ansi.h b/sys/i386/include/ansi.h
index 9d7494e0fc120..22059f1d07256 100644
--- a/sys/i386/include/ansi.h
+++ b/sys/i386/include/ansi.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ansi.h	8.2 (Berkeley) 1/4/94
- * $Id: ansi.h,v 1.15 1998/06/14 14:00:47 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_ANSI_H_
diff --git a/sys/i386/include/apic.h b/sys/i386/include/apic.h
index 55e44e0bec2ff..38c70709e7c2e 100644
--- a/sys/i386/include/apic.h
+++ b/sys/i386/include/apic.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: apic.h,v 1.11 1997/08/04 17:31:24 fsmp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_APIC_H_
diff --git a/sys/i386/include/apicreg.h b/sys/i386/include/apicreg.h
index 55e44e0bec2ff..38c70709e7c2e 100644
--- a/sys/i386/include/apicreg.h
+++ b/sys/i386/include/apicreg.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: apic.h,v 1.11 1997/08/04 17:31:24 fsmp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_APIC_H_
diff --git a/sys/i386/include/apm_bios.h b/sys/i386/include/apm_bios.h
index 5f7cf5b6ef02e..754965ef388f7 100644
--- a/sys/i386/include/apm_bios.h
+++ b/sys/i386/include/apm_bios.h
@@ -12,7 +12,7 @@
  *
  * Aug, 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id: apm_bios.h,v 1.24 1999/07/30 08:24:23 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_MACHINE_APM_BIOS_H_
diff --git a/sys/i386/include/apm_segments.h b/sys/i386/include/apm_segments.h
index 03355374e93ab..9111b5cb0f095 100644
--- a/sys/i386/include/apm_segments.h
+++ b/sys/i386/include/apm_segments.h
@@ -12,7 +12,7 @@
  *
  * Sep., 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_APM_SEGMENTS_H
diff --git a/sys/i386/include/asm.h b/sys/i386/include/asm.h
index f1023173b3d46..7ac1243660249 100644
--- a/sys/i386/include/asm.h
+++ b/sys/i386/include/asm.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)DEFS.h	5.1 (Berkeley) 4/23/90
- *	$Id: asm.h,v 1.3 1997/04/15 14:06:34 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_ASM_H_
diff --git a/sys/i386/include/asmacros.h b/sys/i386/include/asmacros.h
index 00bdf7affe405..92b9e1a5d7007 100644
--- a/sys/i386/include/asmacros.h
+++ b/sys/i386/include/asmacros.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: asmacros.h,v 1.16 1997/04/22 06:55:32 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_ASMACROS_H_
diff --git a/sys/i386/include/asnames.h b/sys/i386/include/asnames.h
index 89218abb317e2..ee2076807da63 100644
--- a/sys/i386/include/asnames.h
+++ b/sys/i386/include/asnames.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: asnames.h,v 1.38 1999/07/29 01:49:19 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_ASNAMES_H_
diff --git a/sys/i386/include/atomic.h b/sys/i386/include/atomic.h
index e9f9403f61985..b3fd514cbc914 100644
--- a/sys/i386/include/atomic.h
+++ b/sys/i386/include/atomic.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: atomic.h,v 1.4 1999/07/23 23:45:19 alc Exp $
+ * $FreeBSD$
  */
 #ifndef _MACHINE_ATOMIC_H_
 #define _MACHINE_ATOMIC_H_
diff --git a/sys/i386/include/bootinfo.h b/sys/i386/include/bootinfo.h
index 928aa2b70de6a..b8d1af3b2c517 100644
--- a/sys/i386/include/bootinfo.h
+++ b/sys/i386/include/bootinfo.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bootinfo.h,v 1.11 1998/10/01 18:22:52 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_MACHINE_BOOTINFO_H_
diff --git a/sys/i386/include/bus.h b/sys/i386/include/bus.h
index 28e80ba2b89aa..b6a9795a5ae5b 100644
--- a/sys/i386/include/bus.h
+++ b/sys/i386/include/bus.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.4 1998/09/29 09:06:00 bde Exp $ */
+/* $FreeBSD$ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
diff --git a/sys/i386/include/bus_at386.h b/sys/i386/include/bus_at386.h
index 28e80ba2b89aa..b6a9795a5ae5b 100644
--- a/sys/i386/include/bus_at386.h
+++ b/sys/i386/include/bus_at386.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.4 1998/09/29 09:06:00 bde Exp $ */
+/* $FreeBSD$ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
diff --git a/sys/i386/include/bus_dma.h b/sys/i386/include/bus_dma.h
index 28e80ba2b89aa..b6a9795a5ae5b 100644
--- a/sys/i386/include/bus_dma.h
+++ b/sys/i386/include/bus_dma.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.4 1998/09/29 09:06:00 bde Exp $ */
+/* $FreeBSD$ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
diff --git a/sys/i386/include/bus_memio.h b/sys/i386/include/bus_memio.h
index ee58d5a24ef22..3533a671fe8d2 100644
--- a/sys/i386/include/bus_memio.h
+++ b/sys/i386/include/bus_memio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _I386_BUS_MEMIO_H_
diff --git a/sys/i386/include/bus_pc98.h b/sys/i386/include/bus_pc98.h
index 28e80ba2b89aa..b6a9795a5ae5b 100644
--- a/sys/i386/include/bus_pc98.h
+++ b/sys/i386/include/bus_pc98.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.4 1998/09/29 09:06:00 bde Exp $ */
+/* $FreeBSD$ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
diff --git a/sys/i386/include/bus_pio.h b/sys/i386/include/bus_pio.h
index 4eb051e181909..8742dd195e0be 100644
--- a/sys/i386/include/bus_pio.h
+++ b/sys/i386/include/bus_pio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _I386_BUS_PIO_H_
diff --git a/sys/i386/include/cdk.h b/sys/i386/include/cdk.h
index f49aa32cf16c8..8080f2b469f26 100644
--- a/sys/i386/include/cdk.h
+++ b/sys/i386/include/cdk.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 /*****************************************************************************/
diff --git a/sys/i386/include/clock.h b/sys/i386/include/clock.h
index 03e2d79e20f63..f5c654a6a64fb 100644
--- a/sys/i386/include/clock.h
+++ b/sys/i386/include/clock.h
@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- *	$Id: clock.h,v 1.34 1998/03/05 21:45:42 tegge Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_CLOCK_H_
diff --git a/sys/i386/include/comstats.h b/sys/i386/include/comstats.h
index f332eebcfb19c..0b8fc4e0de3f1 100644
--- a/sys/i386/include/comstats.h
+++ b/sys/i386/include/comstats.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 /*****************************************************************************/
diff --git a/sys/i386/include/cpu.h b/sys/i386/include/cpu.h
index d3e4ad47b9f09..4a2fe79f41ad6 100644
--- a/sys/i386/include/cpu.h
+++ b/sys/i386/include/cpu.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cpu.h	5.4 (Berkeley) 5/9/91
- *	$Id: cpu.h,v 1.39 1999/04/23 20:22:44 dt Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_CPU_H_
diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h
index 9c72d0db5327f..9618b252019f4 100644
--- a/sys/i386/include/cpufunc.h
+++ b/sys/i386/include/cpufunc.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cpufunc.h,v 1.89 1999/08/19 00:32:48 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/include/cputypes.h b/sys/i386/include/cputypes.h
index ece2509927abc..93e01e26287dd 100644
--- a/sys/i386/include/cputypes.h
+++ b/sys/i386/include/cputypes.h
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cputypes.h,v 1.11 1998/05/22 00:03:23 des Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_CPUTYPES_H_
diff --git a/sys/i386/include/db_machdep.h b/sys/i386/include/db_machdep.h
index aaa32f66661fa..d5022d81e92da 100644
--- a/sys/i386/include/db_machdep.h
+++ b/sys/i386/include/db_machdep.h
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  *
- *	$Id: db_machdep.h,v 1.12 1997/02/22 09:34:24 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_DB_MACHDEP_H_
diff --git a/sys/i386/include/elf.h b/sys/i386/include/elf.h
index ac0cce3ee0e9c..756c08c020426 100644
--- a/sys/i386/include/elf.h
+++ b/sys/i386/include/elf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: elf.h,v 1.6 1999/02/07 23:49:55 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_ELF_H_
diff --git a/sys/i386/include/endian.h b/sys/i386/include/endian.h
index 63971e5a9073a..9023c7680107d 100644
--- a/sys/i386/include/endian.h
+++ b/sys/i386/include/endian.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)endian.h	7.8 (Berkeley) 4/3/91
- *	$Id: endian.h,v 1.15 1997/04/20 11:44:32 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_ENDIAN_H_
diff --git a/sys/i386/include/exec.h b/sys/i386/include/exec.h
index 7670fd1cee1ac..c233b09655b2d 100644
--- a/sys/i386/include/exec.h
+++ b/sys/i386/include/exec.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.1 (Berkeley) 6/11/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_EXEC_H_
diff --git a/sys/i386/include/float.h b/sys/i386/include/float.h
index a0296ecc8c05a..5cdbc97f7d4b4 100644
--- a/sys/i386/include/float.h
+++ b/sys/i386/include/float.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)float.h	7.1 (Berkeley) 5/8/90
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_FLOAT_H_
diff --git a/sys/i386/include/floatingpoint.h b/sys/i386/include/floatingpoint.h
index cd2561f8b9d12..c3e674f7f30ce 100644
--- a/sys/i386/include/floatingpoint.h
+++ b/sys/i386/include/floatingpoint.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#) floatingpoint.h	1.0 (Berkeley) 9/23/93
- *	$Id: floatingpoint.h,v 1.8 1997/02/22 09:34:37 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _FLOATINGPOINT_H_
diff --git a/sys/i386/include/frame.h b/sys/i386/include/frame.h
index f339f01c43c10..b212d6c7b77fc 100644
--- a/sys/i386/include/frame.h
+++ b/sys/i386/include/frame.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)frame.h	5.2 (Berkeley) 1/18/91
- *	$Id: frame.h,v 1.17 1999/05/11 16:29:01 luoqi Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_FRAME_H_
diff --git a/sys/i386/include/globaldata.h b/sys/i386/include/globaldata.h
index c02009b834320..28336d7085343 100644
--- a/sys/i386/include/globaldata.h
+++ b/sys/i386/include/globaldata.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: globaldata.h,v 1.9 1999/05/12 21:39:00 luoqi Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/include/globals.h b/sys/i386/include/globals.h
index 6305f86352db9..b399b7c27ad1b 100644
--- a/sys/i386/include/globals.h
+++ b/sys/i386/include/globals.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: globals.h,v 1.2 1999/05/12 21:39:01 luoqi Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_MACHINE_GLOBALS_H_
diff --git a/sys/i386/include/i4b_cause.h b/sys/i386/include/i4b_cause.h
index 3edf3ad1e142c..f94df0f9ca1c8 100644
--- a/sys/i386/include/i4b_cause.h
+++ b/sys/i386/include/i4b_cause.h
@@ -27,7 +27,7 @@
  *	i4b_cause.h - causes and cause handling for i4b
  *	-----------------------------------------------
  *
- *	$Id: i4b_cause.h,v 1.9 1999/02/14 09:45:02 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Sun Feb 14 10:37:46 1999]
  *
diff --git a/sys/i386/include/i4b_debug.h b/sys/i386/include/i4b_debug.h
index 980bb0ae1d347..e2f1ee17f5836 100644
--- a/sys/i386/include/i4b_debug.h
+++ b/sys/i386/include/i4b_debug.h
@@ -27,7 +27,7 @@
  *	i4b_debug.h - i4b debug header file
  *	-----------------------------------
  *
- *	$Id: i4b_debug.h,v 1.19 1999/05/28 15:03:32 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Fri May 28 16:27:07 1999]
  *
diff --git a/sys/i386/include/i4b_ioctl.h b/sys/i386/include/i4b_ioctl.h
index 2f6c7530990a8..785379f2549cb 100644
--- a/sys/i386/include/i4b_ioctl.h
+++ b/sys/i386/include/i4b_ioctl.h
@@ -27,7 +27,7 @@
  *	i4b_ioctl.h - messages kernel <--> userland
  *	-------------------------------------------
  *
- *	$Id: i4b_ioctl.h,v 1.125 1999/07/30 07:02:11 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Fri Jul 30 08:53:47 1999]
  *
diff --git a/sys/i386/include/i4b_rbch_ioctl.h b/sys/i386/include/i4b_rbch_ioctl.h
index 97bdb90f68448..62d2829b8b83d 100644
--- a/sys/i386/include/i4b_rbch_ioctl.h
+++ b/sys/i386/include/i4b_rbch_ioctl.h
@@ -27,7 +27,7 @@
  *	i4b_rbch_ioctl.h raw B-channel driver interface ioctls
  *	------------------------------------------------------
  *
- *	$Id: i4b_rbch_ioctl.h,v 1.1 1999/07/09 06:44:00 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Fri Jul  9 08:35:07 1999]
  *
diff --git a/sys/i386/include/i4b_tel_ioctl.h b/sys/i386/include/i4b_tel_ioctl.h
index 07fcde86df635..0f1004acae30e 100644
--- a/sys/i386/include/i4b_tel_ioctl.h
+++ b/sys/i386/include/i4b_tel_ioctl.h
@@ -27,7 +27,7 @@
  *	i4b_tel_ioctl.h telephony interface ioctls
  *	------------------------------------------
  *
- *	$Id: i4b_tel_ioctl.h,v 1.10 1999/07/09 06:44:00 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Fri Jul  9 08:34:28 1999]
  *
diff --git a/sys/i386/include/i4b_trace.h b/sys/i386/include/i4b_trace.h
index 5b9a7307dd1c3..3001e6466ee85 100644
--- a/sys/i386/include/i4b_trace.h
+++ b/sys/i386/include/i4b_trace.h
@@ -27,7 +27,7 @@
  *	i4b_trace.h - header file for trace data read device
  *	----------------------------------------------------
  *
- *	$Id: i4b_trace.h,v 1.6 1999/02/14 09:45:02 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:39:26 1999]
  *
diff --git a/sys/i386/include/ieeefp.h b/sys/i386/include/ieeefp.h
index ab4d529ea94cb..3c9c49ddda34c 100644
--- a/sys/i386/include/ieeefp.h
+++ b/sys/i386/include/ieeefp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * 	from: @(#) ieeefp.h 	1.0 (Berkeley) 9/23/93
- *	$Id: ieeefp.h,v 1.5 1997/02/22 09:34:41 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/include/if_wavelan_ieee.h b/sys/i386/include/if_wavelan_ieee.h
index f002933a9bdc5..ef5f5ae709ccc 100644
--- a/sys/i386/include/if_wavelan_ieee.h
+++ b/sys/i386/include/if_wavelan_ieee.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_wavelan_ieee.h,v 1.4 1999/04/27 02:02:41 wpaul Exp $
+ * $FreeBSD$
  */
 
 #ifndef _IF_WAVELAN_IEEE_H
diff --git a/sys/i386/include/if_wl_wavelan.h b/sys/i386/include/if_wl_wavelan.h
index 1626f13862c56..63c5a93f7d9bd 100644
--- a/sys/i386/include/if_wl_wavelan.h
+++ b/sys/i386/include/if_wl_wavelan.h
@@ -1,4 +1,4 @@
-/* $Id: if_wl_wavelan.h,v 1.2 1997/08/01 03:33:43 msmith Exp $ */
+/* $FreeBSD$ */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/i386/include/iic.h b/sys/i386/include/iic.h
index 6649821e0240a..5d362c1a2dd42 100644
--- a/sys/i386/include/iic.h
+++ b/sys/i386/include/iic.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iic.h,v 1.1 1998/09/03 21:00:08 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __IIC_H
diff --git a/sys/i386/include/in_cksum.h b/sys/i386/include/in_cksum.h
index acfa10de0f04e..f2d9beb18993a 100644
--- a/sys/i386/include/in_cksum.h
+++ b/sys/i386/include/in_cksum.h
@@ -33,7 +33,7 @@
  *	from tahoe:	in_cksum.c	1.2	86/01/05
  *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
  *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
- *	$Id: in_cksum.h,v 1.4 1997/02/22 09:34:42 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_IN_CKSUM_H_
diff --git a/sys/i386/include/ioctl_bt848.h b/sys/i386/include/ioctl_bt848.h
index 0767abddb684c..30e18d156da3a 100644
--- a/sys/i386/include/ioctl_bt848.h
+++ b/sys/i386/include/ioctl_bt848.h
@@ -1,7 +1,7 @@
 /*
  * extensions to ioctl_meteor.h for the bt848 cards
  *
- * $Id: ioctl_bt848.h,v 1.22 1999/02/15 11:04:36 roger Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/include/ioctl_ctx.h b/sys/i386/include/ioctl_ctx.h
index 5d7a5c57a3321..8be709aea314b 100644
--- a/sys/i386/include/ioctl_ctx.h
+++ b/sys/i386/include/ioctl_ctx.h
@@ -7,7 +7,7 @@
  *	of this software, nor does the author assume any responsibility
  *	for damages incurred with its use
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/include/ioctl_fd.h b/sys/i386/include/ioctl_fd.h
index 891d8f0a22a9f..3b4da37da238a 100644
--- a/sys/i386/include/ioctl_fd.h
+++ b/sys/i386/include/ioctl_fd.h
@@ -24,7 +24,7 @@
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_MACHINE_IOCTL_FD_H_
diff --git a/sys/i386/include/ipl.h b/sys/i386/include/ipl.h
index 6207e93529b4c..28c39aaf94e02 100644
--- a/sys/i386/include/ipl.h
+++ b/sys/i386/include/ipl.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ipl.h,v 1.15 1998/08/11 19:21:17 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_IPL_H_
diff --git a/sys/i386/include/limits.h b/sys/i386/include/limits.h
index fe6041b4c4b7e..0d258ff9d94c3 100644
--- a/sys/i386/include/limits.h
+++ b/sys/i386/include/limits.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $Id: limits.h,v 1.12 1999/05/20 23:33:35 ache Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/i386/include/lock.h b/sys/i386/include/lock.h
index 1b3c00556426e..1faff8261b329 100644
--- a/sys/i386/include/lock.h
+++ b/sys/i386/include/lock.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: lock.h,v 1.8 1999/08/22 05:37:18 alc Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/include/lpt.h b/sys/i386/include/lpt.h
index 2d70d7ee33976..56d196a62fef1 100644
--- a/sys/i386/include/lpt.h
+++ b/sys/i386/include/lpt.h
@@ -11,7 +11,7 @@
  *
  *	Geoff Rehmet, Rhodes University, South Africa <csgr@cs.ru.ac.za>
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_MACHINE_LPT_H_
diff --git a/sys/i386/include/md_var.h b/sys/i386/include/md_var.h
index 491eb46b024ab..755e1e72cce26 100644
--- a/sys/i386/include/md_var.h
+++ b/sys/i386/include/md_var.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: md_var.h,v 1.29 1999/04/28 01:04:02 luoqi Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_MD_VAR_H_
diff --git a/sys/i386/include/mouse.h b/sys/i386/include/mouse.h
index 98cc0ad38a056..12d49a2a5d759 100644
--- a/sys/i386/include/mouse.h
+++ b/sys/i386/include/mouse.h
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mouse.h,v 1.13 1999/07/12 15:16:12 yokota Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_MOUSE_H_
diff --git a/sys/i386/include/mpapic.h b/sys/i386/include/mpapic.h
index 988a2e1a69ce0..a0099364a99fc 100644
--- a/sys/i386/include/mpapic.h
+++ b/sys/i386/include/mpapic.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mpapic.h,v 1.10 1997/07/28 03:59:34 fsmp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_MPAPIC_H_
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index 969cd0892495d..283ed1701a3cc 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.106 1999/07/20 06:52:26 msmith Exp $
+ * $FreeBSD$
  */
 
 #include "opt_smp.h"
diff --git a/sys/i386/include/mtpr.h b/sys/i386/include/mtpr.h
index e8347e677541c..679de2eed30d5 100644
--- a/sys/i386/include/mtpr.h
+++ b/sys/i386/include/mtpr.h
@@ -1,4 +1,4 @@
 /*
  *	Unused in 386BSD port
- *	$Id$
+ * $FreeBSD$
  */
diff --git a/sys/i386/include/npx.h b/sys/i386/include/npx.h
index 10384c6ebf9ba..2e7a31d25082e 100644
--- a/sys/i386/include/npx.h
+++ b/sys/i386/include/npx.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.h	5.3 (Berkeley) 1/18/91
- *	$Id: npx.h,v 1.14 1997/07/20 11:06:44 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h
index 4f0cbc0d5576b..1a8b1a724b958 100644
--- a/sys/i386/include/param.h
+++ b/sys/i386/include/param.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- *	$Id: param.h,v 1.49 1999/02/19 19:34:48 luoqi Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PARAM_H_
diff --git a/sys/i386/include/pc/bios.h b/sys/i386/include/pc/bios.h
index 1ea2f9273191f..3a317863812fa 100644
--- a/sys/i386/include/pc/bios.h
+++ b/sys/i386/include/pc/bios.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: bios.h,v 1.5 1999/08/18 02:20:04 msmith Exp $
+ * $FreeBSD$
  */
 
 /* 
diff --git a/sys/i386/include/pc/display.h b/sys/i386/include/pc/display.h
index 9e64a3f13307c..cd2d5ff35b73f 100644
--- a/sys/i386/include/pc/display.h
+++ b/sys/i386/include/pc/display.h
@@ -1,7 +1,7 @@
 /*
  * IBM PC display definitions
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /* Color attributes for foreground text */
diff --git a/sys/i386/include/pc/msdos.h b/sys/i386/include/pc/msdos.h
index ea221c7954a50..b56bddc967dd4 100644
--- a/sys/i386/include/pc/msdos.h
+++ b/sys/i386/include/pc/msdos.h
@@ -3,7 +3,7 @@
  * [obtained from mtools -wfj]
  * how to decipher DOS disk structures in coexisting with DOS
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #define MSECTOR_SIZE	512		/* MSDOS sector size in bytes */
diff --git a/sys/i386/include/pc/vesa.h b/sys/i386/include/pc/vesa.h
index f5ce264fce15f..97c4a180d6f9b 100644
--- a/sys/i386/include/pc/vesa.h
+++ b/sys/i386/include/pc/vesa.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: vesa.h,v 1.4 1999/01/11 03:18:20 yokota Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PC_VESA_H
diff --git a/sys/i386/include/pcaudioio.h b/sys/i386/include/pcaudioio.h
index bae4564ee0093..969f910f7f81a 100644
--- a/sys/i386/include/pcaudioio.h
+++ b/sys/i386/include/pcaudioio.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef	_MACHINE_PCAUDIOIO_H_
diff --git a/sys/i386/include/pcb.h b/sys/i386/include/pcb.h
index 5cee924dd9ff2..ed3044cc4d6a6 100644
--- a/sys/i386/include/pcb.h
+++ b/sys/i386/include/pcb.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pcb.h	5.10 (Berkeley) 5/12/91
- *	$Id: pcb.h,v 1.28 1999/06/01 18:20:06 jlemon Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_PCB_H_
diff --git a/sys/i386/include/pcb_ext.h b/sys/i386/include/pcb_ext.h
index 36d07e9e8cecd..154cf949ba0bb 100644
--- a/sys/i386/include/pcb_ext.h
+++ b/sys/i386/include/pcb_ext.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _I386_PCB_EXT_H_
diff --git a/sys/i386/include/pci_cfgreg.h b/sys/i386/include/pci_cfgreg.h
index 44556e7731add..34b3fc54aaa33 100644
--- a/sys/i386/include/pci_cfgreg.h
+++ b/sys/i386/include/pci_cfgreg.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/include/pcpu.h b/sys/i386/include/pcpu.h
index c02009b834320..28336d7085343 100644
--- a/sys/i386/include/pcpu.h
+++ b/sys/i386/include/pcpu.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: globaldata.h,v 1.9 1999/05/12 21:39:00 luoqi Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/include/perfmon.h b/sys/i386/include/perfmon.h
index 6a7ae14e38a26..c8f93f4ee52eb 100644
--- a/sys/i386/include/perfmon.h
+++ b/sys/i386/include/perfmon.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: perfmon.h,v 1.4 1997/02/22 09:34:57 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h
index fd55bdcb2efa0..b9f3f745a4e70 100644
--- a/sys/i386/include/pmap.h
+++ b/sys/i386/include/pmap.h
@@ -42,7 +42,7 @@
  *
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- * 	$Id: pmap.h,v 1.60 1999/04/02 17:59:49 alc Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PMAP_H_
diff --git a/sys/i386/include/proc.h b/sys/i386/include/proc.h
index ae6cd6337bc33..bc2679e385c3a 100644
--- a/sys/i386/include/proc.h
+++ b/sys/i386/include/proc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)proc.h	7.1 (Berkeley) 5/15/91
- *	$Id: proc.h,v 1.8 1997/05/07 19:55:13 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PROC_H_
diff --git a/sys/i386/include/profile.h b/sys/i386/include/profile.h
index e034e611e0695..1d2b6009f52e4 100644
--- a/sys/i386/include/profile.h
+++ b/sys/i386/include/profile.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)profile.h	8.1 (Berkeley) 6/11/93
- * $Id: profile.h,v 1.17 1998/07/14 05:09:43 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PROFILE_H_
diff --git a/sys/i386/include/psl.h b/sys/i386/include/psl.h
index 5f1733587f8e6..6a7e233a84082 100644
--- a/sys/i386/include/psl.h
+++ b/sys/i386/include/psl.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)psl.h	5.2 (Berkeley) 1/18/91
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PSL_H_
diff --git a/sys/i386/include/ptrace.h b/sys/i386/include/ptrace.h
index 2c43a2eef8d4e..55a26fd636ad3 100644
--- a/sys/i386/include/ptrace.h
+++ b/sys/i386/include/ptrace.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $Id: ptrace.h,v 1.6 1998/05/19 00:00:12 tegge Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PTRACE_H_
diff --git a/sys/i386/include/random.h b/sys/i386/include/random.h
index 569173a1a6a25..e084f8111d1e4 100644
--- a/sys/i386/include/random.h
+++ b/sys/i386/include/random.h
@@ -1,7 +1,7 @@
 /*
  * random.h -- A strong random number generator
  *
- * $Id: random.h,v 1.15 1998/06/18 15:32:05 bde Exp $
+ * $FreeBSD$
  *
  * Version 0.95, last modified 18-Oct-95
  * 
diff --git a/sys/i386/include/reg.h b/sys/i386/include/reg.h
index 994bdfda03606..1f541c7b30d04 100644
--- a/sys/i386/include/reg.h
+++ b/sys/i386/include/reg.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)reg.h	5.5 (Berkeley) 1/18/91
- *	$Id: reg.h,v 1.18 1999/04/28 01:04:06 luoqi Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_REG_H_
diff --git a/sys/i386/include/reloc.h b/sys/i386/include/reloc.h
index ead0334ee2213..ef4b8dbc3e8c4 100644
--- a/sys/i386/include/reloc.h
+++ b/sys/i386/include/reloc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)reloc.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _I386_MACHINE_RELOC_H_
diff --git a/sys/i386/include/segments.h b/sys/i386/include/segments.h
index 1a6e20d91af8d..d043d8b5a1131 100644
--- a/sys/i386/include/segments.h
+++ b/sys/i386/include/segments.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)segments.h	7.1 (Berkeley) 5/9/91
- *	$Id: segments.h,v 1.21 1999/07/29 01:49:19 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_SEGMENTS_H_
diff --git a/sys/i386/include/setjmp.h b/sys/i386/include/setjmp.h
index c0337c06ce6d3..173ea2d92f8c1 100644
--- a/sys/i386/include/setjmp.h
+++ b/sys/i386/include/setjmp.h
@@ -1,4 +1,4 @@
-/* $Id: setjmp.h,v 1.1 1998/01/10 23:04:51 jb Exp $ */
+/* $FreeBSD$ */
 /*
  * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
  * All rights reserved.
diff --git a/sys/i386/include/si.h b/sys/i386/include/si.h
index 416486c039b01..29d709bb32848 100644
--- a/sys/i386/include/si.h
+++ b/sys/i386/include/si.h
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.h,v 1.12 1998/03/23 16:27:43 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/callout.h>
diff --git a/sys/i386/include/signal.h b/sys/i386/include/signal.h
index 51dc1960901e2..deaa06ca79237 100644
--- a/sys/i386/include/signal.h
+++ b/sys/i386/include/signal.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.1 (Berkeley) 6/11/93
- * $Id: signal.h,v 1.7 1997/02/22 09:35:12 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_SIGNAL_H_
diff --git a/sys/i386/include/smb.h b/sys/i386/include/smb.h
index e0ebef8b2dd4c..7ed0a82f58fad 100644
--- a/sys/i386/include/smb.h
+++ b/sys/i386/include/smb.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: smb.h,v 1.1 1998/09/03 21:00:08 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __SMB_H
diff --git a/sys/i386/include/smp.h b/sys/i386/include/smp.h
index c425db6f7d32b..0524d76b6fbe7 100644
--- a/sys/i386/include/smp.h
+++ b/sys/i386/include/smp.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: smp.h,v 1.45 1999/04/28 01:04:07 luoqi Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/include/smptests.h b/sys/i386/include/smptests.h
index a4093eee1c698..dd897284e234d 100644
--- a/sys/i386/include/smptests.h
+++ b/sys/i386/include/smptests.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: smptests.h,v 1.31 1998/03/07 20:48:16 tegge Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_SMPTESTS_H_
diff --git a/sys/i386/include/speaker.h b/sys/i386/include/speaker.h
index 0d204bfe2f076..78b55b6135e33 100644
--- a/sys/i386/include/speaker.h
+++ b/sys/i386/include/speaker.h
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  *      modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_MACHINE_SPEAKER_H_
diff --git a/sys/i386/include/specialreg.h b/sys/i386/include/specialreg.h
index f6e04fa98cbcd..d95f9331f6236 100644
--- a/sys/i386/include/specialreg.h
+++ b/sys/i386/include/specialreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)specialreg.h	7.1 (Berkeley) 5/9/91
- *	$Id: specialreg.h,v 1.16 1998/10/06 13:16:26 kato Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_SPECIALREG_H_
diff --git a/sys/i386/include/stdarg.h b/sys/i386/include/stdarg.h
index 1766283e7f25f..341eb87a4728a 100644
--- a/sys/i386/include/stdarg.h
+++ b/sys/i386/include/stdarg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdarg.h	8.1 (Berkeley) 6/10/93
- * $Id: stdarg.h,v 1.8 1997/02/22 09:35:17 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _STDARG_H_
diff --git a/sys/i386/include/sysarch.h b/sys/i386/include/sysarch.h
index a9248389acd25..009c7810259a3 100644
--- a/sys/i386/include/sysarch.h
+++ b/sys/i386/include/sysarch.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sysarch.h,v 1.9 1998/07/28 03:33:27 jlemon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/include/trap.h b/sys/i386/include/trap.h
index 96928d189962f..6cc059a1e5840 100644
--- a/sys/i386/include/trap.h
+++ b/sys/i386/include/trap.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.h	5.4 (Berkeley) 5/9/91
- *	$Id: trap.h,v 1.8 1999/07/25 13:16:08 cracauer Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_TRAP_H_
diff --git a/sys/i386/include/tss.h b/sys/i386/include/tss.h
index 636133a9a8706..2003a66609b48 100644
--- a/sys/i386/include/tss.h
+++ b/sys/i386/include/tss.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)tss.h	5.4 (Berkeley) 1/18/91
- *	$Id: tss.h,v 1.8 1997/02/22 09:35:20 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_TSS_H_
diff --git a/sys/i386/include/types.h b/sys/i386/include/types.h
index c7eec31db1e1d..39672cd98b090 100644
--- a/sys/i386/include/types.h
+++ b/sys/i386/include/types.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)types.h	8.3 (Berkeley) 1/5/94
- * $Id: types.h,v 1.16 1998/12/19 00:02:29 dt Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_TYPES_H_
diff --git a/sys/i386/include/varargs.h b/sys/i386/include/varargs.h
index 5661462e11f4f..d1d4ed0c09060 100644
--- a/sys/i386/include/varargs.h
+++ b/sys/i386/include/varargs.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)varargs.h	8.2 (Berkeley) 3/22/94
- * $Id: varargs.h,v 1.6 1997/02/28 07:12:34 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _VARARGS_H_
diff --git a/sys/i386/include/vm86.h b/sys/i386/include/vm86.h
index 602ef0748f99e..1231bb20a77f0 100644
--- a/sys/i386/include/vm86.h
+++ b/sys/i386/include/vm86.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: vm86.h,v 1.10 1999/04/28 01:04:09 luoqi Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_VM86_H_
diff --git a/sys/i386/include/vmparam.h b/sys/i386/include/vmparam.h
index 9ec54e2d34afc..0a5847dd5ff63 100644
--- a/sys/i386/include/vmparam.h
+++ b/sys/i386/include/vmparam.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vmparam.h	5.9 (Berkeley) 5/12/91
- *	$Id: vmparam.h,v 1.30 1998/06/12 09:10:22 dg Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/include/wtio.h b/sys/i386/include/wtio.h
index 868e34774b8a6..8262a01e093ca 100644
--- a/sys/i386/include/wtio.h
+++ b/sys/i386/include/wtio.h
@@ -19,7 +19,7 @@
  * This driver is derived from the old 386bsd Wangtek streamer tape driver,
  * made by Robert Baron at CMU, based on Intel sources.
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/isa/README.le b/sys/i386/isa/README.le
index a8c33c194b3c3..74ed23c6b9d72 100644
--- a/sys/i386/isa/README.le
+++ b/sys/i386/isa/README.le
@@ -1,4 +1,4 @@
-$Id: README.le,v 1.4 1997/02/22 09:35:49 peter Exp $
+$FreeBSD$
 
 ----------------
 
diff --git a/sys/i386/isa/adv_isa.c b/sys/i386/isa/adv_isa.c
index 5cc06c5801b2c..7390939cb9c59 100644
--- a/sys/i386/isa/adv_isa.c
+++ b/sys/i386/isa/adv_isa.c
@@ -44,7 +44,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: adv_isa.c,v 1.11 1999/05/08 18:20:57 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/isa/aha_isa.c b/sys/i386/isa/aha_isa.c
index b6e0cb08e523e..6484eacb225cf 100644
--- a/sys/i386/isa/aha_isa.c
+++ b/sys/i386/isa/aha_isa.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: aha_isa.c,v 1.8 1999/05/08 18:20:55 peter Exp $
+ * $FreeBSD$
  */
 
 #include "pnp.h"
diff --git a/sys/i386/isa/aic6360.c b/sys/i386/isa/aic6360.c
index e0f946d3d993a..fbe2fde5860f9 100644
--- a/sys/i386/isa/aic6360.c
+++ b/sys/i386/isa/aic6360.c
@@ -32,7 +32,7 @@
  */
 
 /*
- * $Id: aic6360.c,v 1.42 1998/10/22 05:58:38 bde Exp $
+ * $FreeBSD$
  *
  * Acknowledgements: Many of the algorithms used in this driver are
  * inspired by the work of Julian Elischer (julian@tfs.com) and
diff --git a/sys/i386/isa/apic_ipl.h b/sys/i386/isa/apic_ipl.h
index d9db797115198..921802e7b597d 100644
--- a/sys/i386/isa/apic_ipl.h
+++ b/sys/i386/isa/apic_ipl.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: apic_ipl.h,v 1.1 1997/05/31 08:49:08 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_ISA_APIC_IPL_H_
diff --git a/sys/i386/isa/apic_ipl.s b/sys/i386/isa/apic_ipl.s
index 57ddeca3009f5..855de26513382 100644
--- a/sys/i386/isa/apic_ipl.s
+++ b/sys/i386/isa/apic_ipl.s
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: apic_ipl.s,v 1.25 1999/07/10 15:27:58 bde Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/isa/apic_vector.s b/sys/i386/isa/apic_vector.s
index 6a7bcf059a121..f484971eab2bb 100644
--- a/sys/i386/isa/apic_vector.s
+++ b/sys/i386/isa/apic_vector.s
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: apic_vector.s,v 1.43 1999/07/20 06:52:35 msmith Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c
index dce5783cfc6af..b03cf04b3f23a 100644
--- a/sys/i386/isa/asc.c
+++ b/sys/i386/isa/asc.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
- * $Id: asc.c,v 1.38 1999/05/31 11:25:50 phk Exp $
+ * $FreeBSD$
  */
 
 #include "asc.h"
diff --git a/sys/i386/isa/ascreg.h b/sys/i386/isa/ascreg.h
index 41803004dc342..9fcb9a3539085 100644
--- a/sys/i386/isa/ascreg.h
+++ b/sys/i386/isa/ascreg.h
@@ -31,7 +31,7 @@
  */
 
 /*
- * $Id$
+ * $FreeBSD$
  */
 
     /***    Registers (base=3EB): ************/
diff --git a/sys/i386/isa/atapi-cd.c b/sys/i386/isa/atapi-cd.c
index 865f82bae6a26..72412a931331d 100644
--- a/sys/i386/isa/atapi-cd.c
+++ b/sys/i386/isa/atapi-cd.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-cd.c,v 1.20 1999/05/31 11:25:51 phk Exp $
+ * $FreeBSD$
  */
 
 #include "wdc.h"
diff --git a/sys/i386/isa/atapi-cd.h b/sys/i386/isa/atapi-cd.h
index 5bde4b72d1570..3e71b3fe18cbb 100644
--- a/sys/i386/isa/atapi-cd.h
+++ b/sys/i386/isa/atapi-cd.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-cd.h,v 1.3 1999/01/31 21:51:03 sos Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/atpic_vector.s b/sys/i386/isa/atpic_vector.s
index cbb8b5ea49b9f..24ce97b666b97 100644
--- a/sys/i386/isa/atpic_vector.s
+++ b/sys/i386/isa/atpic_vector.s
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: icu_vector.s,v 1.12 1999/05/28 14:08:59 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index 188e20bc0f474..8a3e1c93030c8 100644
--- a/sys/i386/isa/clock.c
+++ b/sys/i386/isa/clock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.142 1999/07/29 01:20:47 green Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index d3bda19123796..efd84295f29d1 100644
--- a/sys/i386/isa/ctx.c
+++ b/sys/i386/isa/ctx.c
@@ -8,7 +8,7 @@
  *	of this software, nor does the author assume any responsibility
  *	for damages incurred with its use.
  *
- *	$Id: ctx.c,v 1.32 1999/05/31 11:25:54 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/ctxreg.h b/sys/i386/isa/ctxreg.h
index 836239bac6894..55503c0a66cd1 100644
--- a/sys/i386/isa/ctxreg.h
+++ b/sys/i386/isa/ctxreg.h
@@ -7,7 +7,7 @@
  *	of this software, nor does the author assume any responsibility
  *	for damages incurred with its use
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index 56b0bbc3621f7..4181c44e2b4e9 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.91 1999/06/04 18:13:25 bde Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/i386/isa/cyreg.h b/sys/i386/isa/cyreg.h
index baedda4175b2f..88a36eb4a65e2 100644
--- a/sys/i386/isa/cyreg.h
+++ b/sys/i386/isa/cyreg.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cyreg.h,v 1.7 1998/08/13 19:03:22 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/diskslice_machdep.c b/sys/i386/isa/diskslice_machdep.c
index d6be12a9ddd00..342537904b6ed 100644
--- a/sys/i386/isa/diskslice_machdep.c
+++ b/sys/i386/isa/diskslice_machdep.c
@@ -35,7 +35,7 @@
  *
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- *	$Id: diskslice_machdep.c,v 1.35 1999/06/26 02:47:09 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/isa/elink.c b/sys/i386/isa/elink.c
index 5d59813afac11..11b107f3f79ec 100644
--- a/sys/i386/isa/elink.c
+++ b/sys/i386/isa/elink.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: elink.c,v 1.8 1997/07/20 14:09:54 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/elink.h b/sys/i386/isa/elink.h
index 1c39b45a7fc37..881b198641ce6 100644
--- a/sys/i386/isa/elink.h
+++ b/sys/i386/isa/elink.h
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: elink.h,v 1.4 1997/02/22 09:36:08 peter Exp $
+ * $FreeBSD$
  */
 
 #ifdef PC98
diff --git a/sys/i386/isa/ic/cd1400.h b/sys/i386/isa/ic/cd1400.h
index ee9b9f27a4ddb..90672c4ee7e6a 100644
--- a/sys/i386/isa/ic/cd1400.h
+++ b/sys/i386/isa/ic/cd1400.h
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cd1400.h,v 1.4 1997/02/22 09:37:59 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/ic/esp.h b/sys/i386/isa/ic/esp.h
index cc74b0b67720a..06b665b708fa0 100644
--- a/sys/i386/isa/ic/esp.h
+++ b/sys/i386/isa/ic/esp.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: esp.h,v 1.4 1999/01/03 05:03:46 kato Exp $
+ * $FreeBSD$
  */
 
 #ifndef _IC_ESP_H_
diff --git a/sys/i386/isa/ic/hd64570.h b/sys/i386/isa/ic/hd64570.h
index e26e89fb789cf..b676e25a9cd5c 100644
--- a/sys/i386/isa/ic/hd64570.h
+++ b/sys/i386/isa/ic/hd64570.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifndef _HD64570_H_
 #define _HD64570_H_
diff --git a/sys/i386/isa/ic/i8042.h b/sys/i386/isa/ic/i8042.h
index 84ee90f08e625..988eaa8987dde 100644
--- a/sys/i386/isa/ic/i8042.h
+++ b/sys/i386/isa/ic/i8042.h
@@ -1,5 +1,5 @@
 /*
- *	$Id$
+ * $FreeBSD$
  */
 
 #define	KBSTATP		0x64	/* kbd controller status port (I) */
diff --git a/sys/i386/isa/ic/i8237.h b/sys/i386/isa/ic/i8237.h
index e955a33b833dd..2bc8a08317c66 100644
--- a/sys/i386/isa/ic/i8237.h
+++ b/sys/i386/isa/ic/i8237.h
@@ -1,7 +1,7 @@
 /*
  * Intel 8237 DMA Controller
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #define	DMA37MD_SINGLE	0x40	/* single pass mode */
diff --git a/sys/i386/isa/ic/i82586.h b/sys/i386/isa/ic/i82586.h
index 704d624b77ae6..964621bd36773 100644
--- a/sys/i386/isa/ic/i82586.h
+++ b/sys/i386/isa/ic/i82586.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: i82586.h,v 1.7 1998/08/10 17:21:48 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/ic/lemac.h b/sys/i386/isa/ic/lemac.h
index f222f1ad71811..239741db9e40b 100644
--- a/sys/i386/isa/ic/lemac.h
+++ b/sys/i386/isa/ic/lemac.h
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $Id$
+ * $FreeBSD$
  */
 #ifndef _LEMAC_H_
 #define	_LEMAC_H_
diff --git a/sys/i386/isa/ic/ns16550.h b/sys/i386/isa/ic/ns16550.h
index b91f5fd2a8395..2d93e76a554d7 100644
--- a/sys/i386/isa/ic/ns16550.h
+++ b/sys/i386/isa/ic/ns16550.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ns16550.h	7.1 (Berkeley) 5/9/91
- *	$Id: ns16550.h,v 1.6 1999/01/03 05:03:46 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/ic/rsa.h b/sys/i386/isa/ic/rsa.h
index e760e306cacc9..6f9376af2f233 100644
--- a/sys/i386/isa/ic/rsa.h
+++ b/sys/i386/isa/ic/rsa.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/ic/scd1400.h b/sys/i386/isa/ic/scd1400.h
index c651a3014ad79..272e56c9e4eb3 100644
--- a/sys/i386/isa/ic/scd1400.h
+++ b/sys/i386/isa/ic/scd1400.h
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 /*****************************************************************************/
diff --git a/sys/i386/isa/icu.h b/sys/i386/isa/icu.h
index cfe4dceb08734..14e8d14aa9bef 100644
--- a/sys/i386/isa/icu.h
+++ b/sys/i386/isa/icu.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)icu.h	5.6 (Berkeley) 5/9/91
- *	$Id: icu.h,v 1.15 1997/07/22 20:12:05 fsmp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/icu_ipl.h b/sys/i386/isa/icu_ipl.h
index 147bad070f551..cdbac2bba1632 100644
--- a/sys/i386/isa/icu_ipl.h
+++ b/sys/i386/isa/icu_ipl.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: icu_ipl.h,v 1.1 1997/05/31 08:50:34 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_ISA_ICU_IPL_H_
diff --git a/sys/i386/isa/icu_ipl.s b/sys/i386/isa/icu_ipl.s
index 0f3a3caeaa33e..34753583a41e5 100644
--- a/sys/i386/isa/icu_ipl.s
+++ b/sys/i386/isa/icu_ipl.s
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: icu_ipl.s,v 1.4 1998/08/11 15:08:12 bde Exp $
+ * $FreeBSD$
  */
 
 	.data
diff --git a/sys/i386/isa/icu_vector.s b/sys/i386/isa/icu_vector.s
index cbb8b5ea49b9f..24ce97b666b97 100644
--- a/sys/i386/isa/icu_vector.s
+++ b/sys/i386/isa/icu_vector.s
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: icu_vector.s,v 1.12 1999/05/28 14:08:59 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/if_ar.c b/sys/i386/isa/if_ar.c
index 66771534bbf03..342cba4959526 100644
--- a/sys/i386/isa/if_ar.c
+++ b/sys/i386/isa/if_ar.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_ar.c,v 1.26 1999/05/06 18:58:04 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/if_arregs.h b/sys/i386/isa/if_arregs.h
index 974b761279629..6c5b020908e20 100644
--- a/sys/i386/isa/if_arregs.h
+++ b/sys/i386/isa/if_arregs.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifndef _IF_ARREGS_H_
 #define _IF_ARREGS_H_
diff --git a/sys/i386/isa/if_cs.c b/sys/i386/isa/if_cs.c
index 4863ffe3c7ff3..aa7e06c788fda 100644
--- a/sys/i386/isa/if_cs.c
+++ b/sys/i386/isa/if_cs.c
@@ -27,7 +27,7 @@
  */
 
 /*
- * $Id: if_cs.c,v 1.10 1999/04/16 21:22:20 peter Exp $
+ * $FreeBSD$
  *
  * Device driver for Crystal Semiconductor CS8920 based ethernet
  *   adapters. By Maxim Bolotin and Oleg Sharoiko, 27-April-1997
diff --git a/sys/i386/isa/if_csreg.h b/sys/i386/isa/if_csreg.h
index 3d53f01db7530..56d9fcd595afc 100644
--- a/sys/i386/isa/if_csreg.h
+++ b/sys/i386/isa/if_csreg.h
@@ -27,7 +27,7 @@
  */
 
 /*
- * $Id: if_csreg.h,v 1.7 1998/07/19 16:13:39 root Exp root $
+ * $FreeBSD$
  */
 
 #define PP_ChipID 0x0000	/* offset   0h -> Corp -ID              */
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c
index d65ac48c3d38c..fed261abfe59b 100644
--- a/sys/i386/isa/if_ed.c
+++ b/sys/i386/isa/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.152 1999/05/09 23:24:45 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/if_edreg.h b/sys/i386/isa/if_edreg.h
index 20a14ed8d86e3..db1a89d9f7ecb 100644
--- a/sys/i386/isa/if_edreg.h
+++ b/sys/i386/isa/if_edreg.h
@@ -6,7 +6,7 @@
  *   of this software, nor does the author assume any responsibility
  *   for damages incurred with its use.
  *
- * $Id: if_edreg.h,v 1.24 1998/10/08 17:04:47 kato Exp $
+ * $FreeBSD$
  */
 /*
  * National Semiconductor DS8390 NIC register definitions
diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c
index 7945fb0800e26..86b796e8bd7fb 100644
--- a/sys/i386/isa/if_el.c
+++ b/sys/i386/isa/if_el.c
@@ -6,7 +6,7 @@
  *
  * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
  *
- * $Id: if_el.c,v 1.44 1999/08/20 14:12:12 mdodd Exp $
+ * $FreeBSD$
  */
 /* Except of course for the portions of code lifted from other FreeBSD
  * drivers (mainly elread, elget and el_ioctl)
diff --git a/sys/i386/isa/if_elreg.h b/sys/i386/isa/if_elreg.h
index 8b133b3bd6d78..3fb3f15a295fc 100644
--- a/sys/i386/isa/if_elreg.h
+++ b/sys/i386/isa/if_elreg.h
@@ -4,7 +4,7 @@
  * of the software, derivative works or modified versions, and any
  * portions thereof.
  *
- * $Id$
+ * $FreeBSD$
  */
 /* 3COM Etherlink 3C501 Register Definitions */
 
diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c
index d1f3460aa545b..a4027a6ae37a5 100644
--- a/sys/i386/isa/if_ep.c
+++ b/sys/i386/isa/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.83 1999/08/18 22:14:20 mdodd Exp $
+ * $FreeBSD$
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
diff --git a/sys/i386/isa/if_epreg.h b/sys/i386/isa/if_epreg.h
index 997b228d01f72..08ff37be4fc7a 100644
--- a/sys/i386/isa/if_epreg.h
+++ b/sys/i386/isa/if_epreg.h
@@ -31,7 +31,7 @@
 
  */
 /*
- *  $Id: if_epreg.h,v 1.23 1998/04/17 22:36:35 des Exp $
+ * $FreeBSD$
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
diff --git a/sys/i386/isa/if_ex.c b/sys/i386/isa/if_ex.c
index 2aef5b290ac4f..bd8103e8bb7ce 100644
--- a/sys/i386/isa/if_ex.c
+++ b/sys/i386/isa/if_ex.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ex.c,v 1.17 1999/08/18 06:11:58 mdodd Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/if_fe.c b/sys/i386/isa/if_fe.c
index 00b793420dd1e..9e3dd65ac396a 100644
--- a/sys/i386/isa/if_fe.c
+++ b/sys/i386/isa/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.53 1999/08/18 22:14:21 mdodd Exp $
+ * $FreeBSD$
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 3.x
diff --git a/sys/i386/isa/if_fereg.h b/sys/i386/isa/if_fereg.h
index d9b943c5febff..7e28201f69878 100644
--- a/sys/i386/isa/if_fereg.h
+++ b/sys/i386/isa/if_fereg.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: if_fereg.h,v 1.5 1997/02/22 09:36:28 peter Exp $ */
+/* $FreeBSD$ */
 
 /*
  * Registers on FMV-180 series' ISA bus interface ASIC.
diff --git a/sys/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c
index d6c928b98f9c9..83142b44bde76 100644
--- a/sys/i386/isa/if_ie.c
+++ b/sys/i386/isa/if_ie.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ie.c,v 1.66 1999/08/21 06:24:14 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/if_ie507.h b/sys/i386/isa/if_ie507.h
index 7583ffd0a0373..9be1396cf49e2 100644
--- a/sys/i386/isa/if_ie507.h
+++ b/sys/i386/isa/if_ie507.h
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $FreeBSD$
  * Definitions for 3C507
  */
 
diff --git a/sys/i386/isa/if_iereg.h b/sys/i386/isa/if_iereg.h
index 3588b84140580..875f63ca9dbb5 100644
--- a/sys/i386/isa/if_iereg.h
+++ b/sys/i386/isa/if_iereg.h
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $FreeBSD$
  * definitions for AT&T StarLAN 10 etc...
  */
 
diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c
index 073259d911384..700cb6dc8f5a3 100644
--- a/sys/i386/isa/if_le.c
+++ b/sys/i386/isa/if_le.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_le.c,v 1.52 1999/08/18 06:11:59 mdodd Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/if_lnc.c b/sys/i386/isa/if_lnc.c
index 058ca3f574262..6345dffd1131a 100644
--- a/sys/i386/isa/if_lnc.c
+++ b/sys/i386/isa/if_lnc.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_lnc.c,v 1.64 1999/08/18 22:14:23 mdodd Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/if_lnc.h b/sys/i386/isa/if_lnc.h
index aeff426d5e173..f3d37f44654ce 100644
--- a/sys/i386/isa/if_lnc.h
+++ b/sys/i386/isa/if_lnc.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_lnc.h,v 1.11 1999/07/06 19:22:51 des Exp $
+ * $FreeBSD$
  */
 
 #include <i386/isa/ic/Am7990.h>
diff --git a/sys/i386/isa/if_rdp.c b/sys/i386/isa/if_rdp.c
index b7c90a8eeb902..7d8fa3031e8b5 100644
--- a/sys/i386/isa/if_rdp.c
+++ b/sys/i386/isa/if_rdp.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_rdp.c,v 1.3 1999/01/12 00:36:31 eivind Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/if_rdpreg.h b/sys/i386/isa/if_rdpreg.h
index cab679a4bd3eb..ee56e82e4963a 100644
--- a/sys/i386/isa/if_rdpreg.h
+++ b/sys/i386/isa/if_rdpreg.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_rdpreg.h,v 1.1.1.1 1998/12/21 12:43:35 j Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/if_sr.c b/sys/i386/isa/if_sr.c
index ba883f7fecc9d..6d56ab42712f7 100644
--- a/sys/i386/isa/if_sr.c
+++ b/sys/i386/isa/if_sr.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr.c,v 1.23 1999/05/06 22:14:46 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/if_srregs.h b/sys/i386/isa/if_srregs.h
index 689b6abecf2dc..64d9ba11c50e4 100644
--- a/sys/i386/isa/if_srregs.h
+++ b/sys/i386/isa/if_srregs.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifndef _IF_SRREGS_H_
 #define _IF_SRREGS_H_
diff --git a/sys/i386/isa/if_wi.c b/sys/i386/isa/if_wi.c
index 0a92e80924637..73e56d7295b63 100644
--- a/sys/i386/isa/if_wi.c
+++ b/sys/i386/isa/if_wi.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_wi.c,v 1.9 1999/08/21 06:24:15 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -117,7 +117,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_wi.c,v 1.9 1999/08/21 06:24:15 msmith Exp $";
+  "$FreeBSD$";
 #endif
 
 static struct wi_softc wi_softc[NWI];
diff --git a/sys/i386/isa/if_wireg.h b/sys/i386/isa/if_wireg.h
index 75c963ea4686f..d4173273f5249 100644
--- a/sys/i386/isa/if_wireg.h
+++ b/sys/i386/isa/if_wireg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_wireg.h,v 1.4 1999/05/07 03:28:52 wpaul Exp $
+ * $FreeBSD$
  */
 
 struct wi_counters {
diff --git a/sys/i386/isa/if_wl.c b/sys/i386/isa/if_wl.c
index 2c37caf847740..2a68f775e6775 100644
--- a/sys/i386/isa/if_wl.c
+++ b/sys/i386/isa/if_wl.c
@@ -1,4 +1,4 @@
-/* $Id: if_wl.c,v 1.23 1999/08/18 06:11:59 mdodd Exp $ */
+/* $FreeBSD$ */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/sys/i386/isa/if_ze.c b/sys/i386/isa/if_ze.c
index 7f59869e2d45e..8db782237caa1 100644
--- a/sys/i386/isa/if_ze.c
+++ b/sys/i386/isa/if_ze.c
@@ -47,7 +47,7 @@
  */
 
 /*
- * $Id: if_ze.c,v 1.60 1999/08/18 06:12:00 mdodd Exp $
+ * $FreeBSD$
  */
 
 /* XXX don't mix different PCCARD support code. */
diff --git a/sys/i386/isa/if_zp.c b/sys/i386/isa/if_zp.c
index a7059fae30aae..3043517939e68 100644
--- a/sys/i386/isa/if_zp.c
+++ b/sys/i386/isa/if_zp.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $
- *	$Id: if_zp.c,v 1.53 1999/08/18 06:12:00 mdodd Exp $
+ * $FreeBSD$
  */
 /*-
  * TODO:
diff --git a/sys/i386/isa/if_zpreg.h b/sys/i386/isa/if_zpreg.h
index 31720b5f5a378..b9848f7cfec32 100644
--- a/sys/i386/isa/if_zpreg.h
+++ b/sys/i386/isa/if_zpreg.h
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 /**************************************************************************
  *										  *
diff --git a/sys/i386/isa/intr_machdep.c b/sys/i386/isa/intr_machdep.c
index 3a214a99522a6..8bdb4b6d72d4a 100644
--- a/sys/i386/isa/intr_machdep.c
+++ b/sys/i386/isa/intr_machdep.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: intr_machdep.c,v 1.22 1999/05/22 09:39:31 peter Exp $
+ * $FreeBSD$
  */
 /*
  * This file contains an aggregated module marked:
@@ -506,7 +506,7 @@ icu_unset(intr, handler)
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: intr_machdep.c,v 1.22 1999/05/22 09:39:31 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/isa/intr_machdep.h b/sys/i386/isa/intr_machdep.h
index 06593cf359f44..adea3037caa19 100644
--- a/sys/i386/isa/intr_machdep.h
+++ b/sys/i386/isa/intr_machdep.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: intr_machdep.h,v 1.15 1999/06/03 20:41:00 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_ISA_INTR_MACHDEP_H_
diff --git a/sys/i386/isa/ipl.s b/sys/i386/isa/ipl.s
index ad7eb1132bb54..964834d916fe4 100644
--- a/sys/i386/isa/ipl.s
+++ b/sys/i386/isa/ipl.s
@@ -36,7 +36,7 @@
  *
  *	@(#)ipl.s
  *
- *	$Id: ipl.s,v 1.29 1999/07/03 06:33:48 alc Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/isa/ipl_funcs.c b/sys/i386/isa/ipl_funcs.c
index a4756d87dfc8d..78b1c1d5fef2d 100644
--- a/sys/i386/isa/ipl_funcs.c
+++ b/sys/i386/isa/ipl_funcs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ipl_funcs.c,v 1.27 1999/07/20 06:09:53 alc Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c
index 8e153a71c62be..f87d9816f0716 100644
--- a/sys/i386/isa/isa.c
+++ b/sys/i386/isa/isa.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: isa.c,v 1.127 1999/05/22 15:18:12 dfr Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/isa.h b/sys/i386/isa/isa.h
index ea25f20604ee3..cc66da9be0454 100644
--- a/sys/i386/isa/isa.h
+++ b/sys/i386/isa/isa.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- *	$Id: isa.h,v 1.21 1997/02/22 09:36:41 peter Exp $
+ * $FreeBSD$
  */
 
 #ifdef PC98
diff --git a/sys/i386/isa/isa_compat.c b/sys/i386/isa/isa_compat.c
index 83fd0bcebeac0..c84d1e22cc23c 100644
--- a/sys/i386/isa/isa_compat.c
+++ b/sys/i386/isa/isa_compat.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: isa_compat.c,v 1.12 1999/05/30 11:04:31 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/isa/isa_compat.h b/sys/i386/isa/isa_compat.h
index 6d763811ae456..e6f57f6c81cfc 100644
--- a/sys/i386/isa/isa_compat.h
+++ b/sys/i386/isa/isa_compat.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: isa_compat.h,v 1.7 1999/05/09 09:56:52 phk Exp $
+ * $FreeBSD$
  */
 
 #include "vt.h"
diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h
index 022dfc34da45c..07cbd8d04c470 100644
--- a/sys/i386/isa/isa_device.h
+++ b/sys/i386/isa/isa_device.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa_device.h	7.1 (Berkeley) 5/9/91
- *	$Id: isa_device.h,v 1.61 1999/05/08 18:20:05 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_ISA_ISA_DEVICE_H_
diff --git a/sys/i386/isa/isa_dma.c b/sys/i386/isa/isa_dma.c
index 7855aaa89fa18..698c67004a7e4 100644
--- a/sys/i386/isa/isa_dma.c
+++ b/sys/i386/isa/isa_dma.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa_dma.c,v 1.2 1999/04/21 07:26:28 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/isa_dma.h b/sys/i386/isa/isa_dma.h
index 3fe234c3422cb..15f8b3d804dae 100644
--- a/sys/i386/isa/isa_dma.h
+++ b/sys/i386/isa/isa_dma.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa_device.h	7.1 (Berkeley) 5/9/91
- *	$Id: isa_device.h,v 1.57 1999/01/17 06:33:43 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_ISA_ISA_DMA_H_
diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c
index a0be302ca3112..3ed23fea4b501 100644
--- a/sys/i386/isa/istallion.c
+++ b/sys/i386/isa/istallion.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: istallion.c,v 1.29 1999/05/31 11:26:09 phk Exp $
+ * $FreeBSD$
  */
 
 /*****************************************************************************/
diff --git a/sys/i386/isa/loran.c b/sys/i386/isa/loran.c
index 09e86395df2c2..ef72e12af63f3 100644
--- a/sys/i386/isa/loran.c
+++ b/sys/i386/isa/loran.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: loran.c,v 1.19 1999/05/30 16:52:19 phk Exp $
+ * $FreeBSD$
  *
  * This device-driver helps the userland controlprogram for a LORAN-C
  * receiver avoid monopolizing the CPU.
diff --git a/sys/i386/isa/lptreg.h b/sys/i386/isa/lptreg.h
index db970a2788ee0..70906f0073ec0 100644
--- a/sys/i386/isa/lptreg.h
+++ b/sys/i386/isa/lptreg.h
@@ -6,7 +6,7 @@
  * William Jolitz.
  *
  *      form: @(#)lptreg.h	1.1 (Berkeley) 12/19/90
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c
index 4705d15c63f45..a29d1b9b1e5b9 100644
--- a/sys/i386/isa/matcd/matcd.c
+++ b/sys/i386/isa/matcd/matcd.c
@@ -337,7 +337,7 @@ static char	MATCDVERSION[]="Version  1(26) 18-Oct-95";
 static char	MATCDCOPYRIGHT[] = "Matsushita CD-ROM driver, Copr. 1994,1995 Frank Durda IV";
 /*	The proceeding strings may not be changed*/
 
-/* $Id: matcd.c,v 1.42 1999/07/03 21:02:09 peter Exp $ */
+/* $FreeBSD$ */
 
 /*---------------------------------------------------------------------------
 	Include declarations
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index 0f5001715722d..5ab40ef0761c0 100644
--- a/sys/i386/isa/mcd.c
+++ b/sys/i386/isa/mcd.c
@@ -40,7 +40,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.108 1999/05/31 11:26:15 phk Exp $
+ * $FreeBSD$
  */
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
diff --git a/sys/i386/isa/mcdreg.h b/sys/i386/isa/mcdreg.h
index 219e119d5a874..f0f75f7b2254a 100644
--- a/sys/i386/isa/mcdreg.h
+++ b/sys/i386/isa/mcdreg.h
@@ -41,7 +41,7 @@
  * the manufacturer or anyone else might provide better documentation,
  * so this file (and the driver) will then have a better quality.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef MCD_H
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index ddc41a8215f50..f6d6c663652b2 100644
--- a/sys/i386/isa/mse.c
+++ b/sys/i386/isa/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $Id: mse.c,v 1.44 1999/05/31 11:26:17 phk Exp $
+ * $FreeBSD$
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
diff --git a/sys/i386/isa/nmi.c b/sys/i386/isa/nmi.c
index 3a214a99522a6..8bdb4b6d72d4a 100644
--- a/sys/i386/isa/nmi.c
+++ b/sys/i386/isa/nmi.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: intr_machdep.c,v 1.22 1999/05/22 09:39:31 peter Exp $
+ * $FreeBSD$
  */
 /*
  * This file contains an aggregated module marked:
@@ -506,7 +506,7 @@ icu_unset(intr, handler)
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: intr_machdep.c,v 1.22 1999/05/22 09:39:31 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index a99b5674ea4b4..374c066170134 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/isa/npx.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.75 1999/07/26 05:47:31 cracauer Exp $
+ * $FreeBSD$
  */
 
 #include "npx.h"
diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c
index cdf3b358220e7..62875bf487c8f 100644
--- a/sys/i386/isa/pcaudio.c
+++ b/sys/i386/isa/pcaudio.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: pcaudio.c,v 1.50 1999/05/31 11:26:19 phk Exp $
+ * $FreeBSD$
  */
 
 #include "pca.h"
diff --git a/sys/i386/isa/pcf.c b/sys/i386/isa/pcf.c
index e5498b40b5fdf..8cebfb004c0dd 100644
--- a/sys/i386/isa/pcf.c
+++ b/sys/i386/isa/pcf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: pcf.c,v 1.9 1999/05/08 21:59:27 dfr Exp $
+ * $FreeBSD$
  *
  */
 #include <sys/param.h>
diff --git a/sys/i386/isa/pcibus.c b/sys/i386/isa/pcibus.c
index 08cba7f52e067..741baa907f632 100644
--- a/sys/i386/isa/pcibus.c
+++ b/sys/i386/isa/pcibus.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcibus.c,v 1.46 1999/08/10 09:22:21 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/isa/pcibus.h b/sys/i386/isa/pcibus.h
index 44556e7731add..34b3fc54aaa33 100644
--- a/sys/i386/isa/pcibus.h
+++ b/sys/i386/isa/pcibus.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/isa/pnp.c b/sys/i386/isa/pnp.c
index 94a039c089b1a..f8147d05e305a 100644
--- a/sys/i386/isa/pnp.c
+++ b/sys/i386/isa/pnp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: pnp.c,v 1.10 1999/04/11 03:06:06 eivind Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/isa/pnp.h b/sys/i386/isa/pnp.h
index b91b50d1198b5..7b6392578d929 100644
--- a/sys/i386/isa/pnp.h
+++ b/sys/i386/isa/pnp.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: pnp.h,v 1.8 1999/08/22 19:46:05 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_ISA_PNP_H_
diff --git a/sys/i386/isa/ppc.c b/sys/i386/isa/ppc.c
index 073eab558d8fe..436caebf84a21 100644
--- a/sys/i386/isa/ppc.c
+++ b/sys/i386/isa/ppc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppc.c,v 1.20 1999/02/14 22:02:47 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #include "ppc.h"
diff --git a/sys/i386/isa/ppcreg.h b/sys/i386/isa/ppcreg.h
index 3a61ae7675a95..faecb9771ff85 100644
--- a/sys/i386/isa/ppcreg.h
+++ b/sys/i386/isa/ppcreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppcreg.h,v 1.7 1999/01/10 16:41:13 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __PPCREG_H
diff --git a/sys/i386/isa/prof_machdep.c b/sys/i386/isa/prof_machdep.c
index 34479056ed73a..d934ee56eee6a 100644
--- a/sys/i386/isa/prof_machdep.c
+++ b/sys/i386/isa/prof_machdep.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: prof_machdep.c,v 1.12 1999/05/06 09:44:55 bde Exp $
+ * $FreeBSD$
  */
 
 #ifdef GUPROF
diff --git a/sys/i386/isa/random_machdep.c b/sys/i386/isa/random_machdep.c
index 4268375a057ca..c9c450fc4f027 100644
--- a/sys/i386/isa/random_machdep.c
+++ b/sys/i386/isa/random_machdep.c
@@ -1,7 +1,7 @@
 /*
  * random_machdep.c -- A strong random number generator
  *
- * $Id: random_machdep.c,v 1.30 1999/04/21 07:26:28 peter Exp $
+ * $FreeBSD$
  *
  * Version 0.95, last modified 18-Oct-95
  * 
diff --git a/sys/i386/isa/rp.c b/sys/i386/isa/rp.c
index b16f6e4f9131f..a3a4db2be574d 100644
--- a/sys/i386/isa/rp.c
+++ b/sys/i386/isa/rp.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: rp.c,v 1.28 1999/05/31 11:26:24 phk Exp $
+ * $FreeBSD$
  */
 
 /* 
diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c
index a9e39f13fdc20..5ec3eadead222 100644
--- a/sys/i386/isa/scd.c
+++ b/sys/i386/isa/scd.c
@@ -41,7 +41,7 @@
  */
 
 
-/* $Id: scd.c,v 1.47 1999/05/31 11:26:26 phk Exp $ */
+/* $FreeBSD$ */
 
 /* Please send any comments to micke@dynas.se */
 
diff --git a/sys/i386/isa/scdreg.h b/sys/i386/isa/scdreg.h
index d04dc6919e2e0..e9ce3b15a23f9 100644
--- a/sys/i386/isa/scdreg.h
+++ b/sys/i386/isa/scdreg.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c
index 34b19d4674950..4186f4be232b5 100644
--- a/sys/i386/isa/si.c
+++ b/sys/i386/isa/si.c
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.c,v 1.90 1999/08/27 06:53:34 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/sys/i386/isa/sireg.h b/sys/i386/isa/sireg.h
index 4697a7fe236d5..711bf92e7ea07 100644
--- a/sys/i386/isa/sireg.h
+++ b/sys/i386/isa/sireg.h
@@ -30,7 +30,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: sireg.h,v 1.6 1998/03/23 16:27:40 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/sound/mmap_test.c b/sys/i386/isa/sound/mmap_test.c
index c6afae932d470..8f2f5a547b981 100644
--- a/sys/i386/isa/sound/mmap_test.c
+++ b/sys/i386/isa/sound/mmap_test.c
@@ -15,7 +15,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: mmap_test.c,v 1.2 1998/01/16 07:20:34 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sys/i386/isa/sound/pcm86.c b/sys/i386/isa/sound/pcm86.c
index c6f11f33fc55a..11cbdee02139f 100644
--- a/sys/i386/isa/sound/pcm86.c
+++ b/sys/i386/isa/sound/pcm86.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: pcm86.c,v 1.7 1999/01/01 08:18:06 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/sound/sound.doc b/sys/i386/isa/sound/sound.doc
index 2340d6079c185..13f370275036b 100644
--- a/sys/i386/isa/sound/sound.doc
+++ b/sys/i386/isa/sound/sound.doc
@@ -1,4 +1,4 @@
-$Id: sound.doc,v 1.9 1998/10/22 15:37:35 bde Exp $
+$FreeBSD$
 
 Instructions on using audio on a FreeBSD 2.1 (or 2.0-current) system.
 See also /sys/i386/conf/LINT.
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index 29f82055c98ac..39d50c4c923ac 100644
--- a/sys/i386/isa/spkr.c
+++ b/sys/i386/isa/spkr.c
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- *    $Id: spkr.c,v 1.39 1999/08/23 20:35:17 bde Exp $
+ * $FreeBSD$
  */
 
 #include "speaker.h"
diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c
index e7818522d450d..4baeeefbc06a6 100644
--- a/sys/i386/isa/stallion.c
+++ b/sys/i386/isa/stallion.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: stallion.c,v 1.33 1999/05/31 11:26:33 phk Exp $
+ * $FreeBSD$
  */
 
 /*****************************************************************************/
diff --git a/sys/i386/isa/timerreg.h b/sys/i386/isa/timerreg.h
index ff27bacc24a46..0bfd7fc8cd630 100644
--- a/sys/i386/isa/timerreg.h
+++ b/sys/i386/isa/timerreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: Header: timerreg.h,v 1.2 93/02/28 15:08:58 mccanne Exp
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/vector.s b/sys/i386/isa/vector.s
index 608f13586c3b4..5447a90126a03 100644
--- a/sys/i386/isa/vector.s
+++ b/sys/i386/isa/vector.s
@@ -1,6 +1,6 @@
 /*
  *	from: vector.s, 386BSD 0.1 unknown origin
- *	$Id: vector.s,v 1.30 1997/05/26 17:58:27 fsmp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/vesa.c b/sys/i386/isa/vesa.c
index e4707a175b245..101547102b8d8 100644
--- a/sys/i386/isa/vesa.c
+++ b/sys/i386/isa/vesa.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: vesa.c,v 1.27 1999/08/27 09:18:42 yokota Exp $
+ * $FreeBSD$
  */
 
 #include "vga.h"
diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index 74de2820d876e..972518391fc4d 100644
--- a/sys/i386/isa/wd.c
+++ b/sys/i386/isa/wd.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.201 1999/08/14 11:40:40 phk Exp $
+ * $FreeBSD$
  */
 
 /* TODO:
diff --git a/sys/i386/isa/wd_cd.c b/sys/i386/isa/wd_cd.c
index 865f82bae6a26..72412a931331d 100644
--- a/sys/i386/isa/wd_cd.c
+++ b/sys/i386/isa/wd_cd.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-cd.c,v 1.20 1999/05/31 11:25:51 phk Exp $
+ * $FreeBSD$
  */
 
 #include "wdc.h"
diff --git a/sys/i386/isa/wd_cd.h b/sys/i386/isa/wd_cd.h
index 5bde4b72d1570..3e71b3fe18cbb 100644
--- a/sys/i386/isa/wd_cd.h
+++ b/sys/i386/isa/wd_cd.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-cd.h,v 1.3 1999/01/31 21:51:03 sos Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/wdreg.h b/sys/i386/isa/wdreg.h
index 6730c55cfa22c..1cf76da0fc2d3 100644
--- a/sys/i386/isa/wdreg.h
+++ b/sys/i386/isa/wdreg.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wdreg.h	7.1 (Berkeley) 5/9/91
- *	$Id: wdreg.h,v 1.26 1999/04/13 20:22:32 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/wfd.c b/sys/i386/isa/wfd.c
index a089527fa1eab..f7837d7407bfd 100644
--- a/sys/i386/isa/wfd.c
+++ b/sys/i386/isa/wfd.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $Id: wfd.c,v 1.27 1999/08/14 11:40:41 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/isa/wst.c b/sys/i386/isa/wst.c
index 7337796969a5c..5dae30e4e97a4 100644
--- a/sys/i386/isa/wst.c
+++ b/sys/i386/isa/wst.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: wst.c,v 1.23 1999/05/31 11:26:39 phk Exp $
+ * $FreeBSD$
  */
 
 #include "wdc.h"
diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index 36f2e012e77f6..6cb7a1375651c 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c
@@ -20,7 +20,7 @@
  * the original CMU copyright notice.
  *
  * Version 1.3, Thu Nov 11 12:09:13 MSK 1993
- * $Id: wt.c,v 1.52 1999/05/31 11:26:40 phk Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/isa/wtreg.h b/sys/i386/isa/wtreg.h
index 67836c50d8a7f..33f0ee478750b 100644
--- a/sys/i386/isa/wtreg.h
+++ b/sys/i386/isa/wtreg.h
@@ -19,7 +19,7 @@
  * the original CMU copyright notice.
  *
  * Version 1.3, Thu Nov 11 12:09:13 MSK 1993
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/linux/Makefile b/sys/i386/linux/Makefile
index d399ad080a374..c062c96ec1779 100644
--- a/sys/i386/linux/Makefile
+++ b/sys/i386/linux/Makefile
@@ -1,6 +1,6 @@
 # Makefile for syscall tables
 #
-# $Id: Makefile,v 1.2 1997/03/29 10:48:49 peter Exp $
+# $FreeBSD$
 
 all:
 	@echo "make linux_sysent.c only"
diff --git a/sys/i386/linux/imgact_linux.c b/sys/i386/linux/imgact_linux.c
index 3850a4de2fb56..6a766ba5d9f41 100644
--- a/sys/i386/linux/imgact_linux.c
+++ b/sys/i386/linux/imgact_linux.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: imgact_linux.c,v 1.31 1999/01/17 20:36:14 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h
index 93fafa2a37124..4e5db53e99cfe 100644
--- a/sys/i386/linux/linux.h
+++ b/sys/i386/linux/linux.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: linux.h,v 1.34 1999/08/15 17:28:39 marcel Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_LINUX_LINUX_H_
diff --git a/sys/i386/linux/linux_dummy.c b/sys/i386/linux/linux_dummy.c
index 5d5169d996895..c76402c31e685 100644
--- a/sys/i386/linux/linux_dummy.c
+++ b/sys/i386/linux/linux_dummy.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_dummy.c,v 1.11 1999/08/25 11:19:01 marcel Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/linux/linux_file.c b/sys/i386/linux/linux_file.c
index a5b051fd1be90..b0e8a367c83a5 100644
--- a/sys/i386/linux/linux_file.c
+++ b/sys/i386/linux/linux_file.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_file.c,v 1.30 1999/08/14 18:20:44 marcel Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/i386/linux/linux_genassym.c b/sys/i386/linux/linux_genassym.c
index 99a88a510f6f9..5d962a6c04d40 100644
--- a/sys/i386/linux/linux_genassym.c
+++ b/sys/i386/linux/linux_genassym.c
@@ -1,4 +1,4 @@
-/* $Id: linux_genassym.c,v 1.8 1998/07/29 15:50:41 bde Exp $ */
+/* $FreeBSD$ */
 
 #include <sys/param.h>
 
diff --git a/sys/i386/linux/linux_ioctl.c b/sys/i386/linux/linux_ioctl.c
index 53becd770429c..56a0eda42066e 100644
--- a/sys/i386/linux/linux_ioctl.c
+++ b/sys/i386/linux/linux_ioctl.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_ioctl.c,v 1.40 1999/08/14 13:26:44 marcel Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/linux/linux_ipc.c b/sys/i386/linux/linux_ipc.c
index 7315fa9c23868..5efee536adb3f 100644
--- a/sys/i386/linux/linux_ipc.c
+++ b/sys/i386/linux/linux_ipc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_ipc.c,v 1.13 1997/11/06 19:28:57 phk Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/i386/linux/linux_misc.c b/sys/i386/linux/linux_misc.c
index 74fb7319be802..98348750170d4 100644
--- a/sys/i386/linux/linux_misc.c
+++ b/sys/i386/linux/linux_misc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_misc.c,v 1.67 1999/08/25 14:11:01 marcel Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/i386/linux/linux_signal.c b/sys/i386/linux/linux_signal.c
index 29b5c4c3ebf0b..9f2200e526a69 100644
--- a/sys/i386/linux/linux_signal.c
+++ b/sys/i386/linux/linux_signal.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_signal.c,v 1.16 1999/07/06 06:54:00 cracauer Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/linux/linux_socket.c b/sys/i386/linux/linux_socket.c
index e757fc13c7f81..d29efb63d85de 100644
--- a/sys/i386/linux/linux_socket.c
+++ b/sys/i386/linux/linux_socket.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_socket.c,v 1.14 1998/12/30 21:20:00 sos Exp $
+ * $FreeBSD$
  */
 
 /* XXX we use functions that might not exist. */
diff --git a/sys/i386/linux/linux_stats.c b/sys/i386/linux/linux_stats.c
index bfa11f642edbe..b1fc1a4e5ee82 100644
--- a/sys/i386/linux/linux_stats.c
+++ b/sys/i386/linux/linux_stats.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_stats.c,v 1.12 1999/05/11 19:54:20 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index 6c626bca01d8a..871ccfbed4c1e 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_sysvec.c,v 1.47 1999/04/28 01:04:20 luoqi Exp $
+ * $FreeBSD$
  */
 
 /* XXX we use functions that might not exist. */
diff --git a/sys/i386/linux/linux_util.c b/sys/i386/linux/linux_util.c
index 11739158917af..7c87174089a91 100644
--- a/sys/i386/linux/linux_util.c
+++ b/sys/i386/linux/linux_util.c
@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	from: svr4_util.c,v 1.5 1995/01/22 23:44:50 christos Exp
- *	$Id: linux_util.c,v 1.6 1997/03/24 11:24:31 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/i386/linux/linux_util.h b/sys/i386/linux/linux_util.h
index 2905f00ca4ef1..61a637171083e 100644
--- a/sys/i386/linux/linux_util.h
+++ b/sys/i386/linux/linux_util.h
@@ -28,7 +28,7 @@
  *
  * from: svr4_util.h,v 1.5 1994/11/18 02:54:31 christos Exp
  * from: linux_util.h,v 1.2 1995/03/05 23:23:50 fvdl Exp
- * $Id: linux_util.h,v 1.7 1998/12/16 16:28:57 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/i386/linux/syscalls.conf b/sys/i386/linux/syscalls.conf
index d1e1425ed5a25..01e258801231d 100644
--- a/sys/i386/linux/syscalls.conf
+++ b/sys/i386/linux/syscalls.conf
@@ -1,4 +1,4 @@
-# $Id: syscalls.conf,v 1.3 1997/02/22 09:38:31 peter Exp $
+# $FreeBSD$
 sysnames="/dev/null"
 sysproto="linux_proto.h"
 sysproto_h=_LINUX_SYSPROTO_H_
diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master
index 369ee6ffd3a9b..5e6ce0719a2a1 100644
--- a/sys/i386/linux/syscalls.master
+++ b/sys/i386/linux/syscalls.master
@@ -1,4 +1,4 @@
-	$Id: syscalls.master,v 1.22 1999/08/16 11:47:21 marcel Exp $
+ $FreeBSD$
 
 ;	@(#)syscalls.master	8.1 (Berkeley) 7/19/93
 ; System call name/number master file (or rather, slave, from LINUX).
diff --git a/sys/i386/pci/pci_bus.c b/sys/i386/pci/pci_bus.c
index 08cba7f52e067..741baa907f632 100644
--- a/sys/i386/pci/pci_bus.c
+++ b/sys/i386/pci/pci_bus.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcibus.c,v 1.46 1999/08/10 09:22:21 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c
index 08cba7f52e067..741baa907f632 100644
--- a/sys/i386/pci/pci_cfgreg.c
+++ b/sys/i386/pci/pci_cfgreg.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcibus.c,v 1.46 1999/08/10 09:22:21 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/pci/pci_pir.c b/sys/i386/pci/pci_pir.c
index 08cba7f52e067..741baa907f632 100644
--- a/sys/i386/pci/pci_pir.c
+++ b/sys/i386/pci/pci_pir.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcibus.c,v 1.46 1999/08/10 09:22:21 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/i386/svr4/svr4_genassym.c b/sys/i386/svr4/svr4_genassym.c
index a21c0be0980c1..41583f5896ca7 100644
--- a/sys/i386/svr4/svr4_genassym.c
+++ b/sys/i386/svr4/svr4_genassym.c
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /* Derived from:  Id: linux_genassym.c,v 1.8 1998/07/29 15:50:41 bde Exp */
 
 #include <sys/param.h>
diff --git a/sys/i386/svr4/svr4_locore.s b/sys/i386/svr4/svr4_locore.s
index 065dbdb117bac..6c3b0ae8fe4f6 100644
--- a/sys/i386/svr4/svr4_locore.s
+++ b/sys/i386/svr4/svr4_locore.s
@@ -3,7 +3,7 @@
 
 #include <svr4/svr4_syscall.h>		/* system call numbers */
 
-/* $Id: svr4_locore.s,v 1.6 1999/07/30 12:47:17 newton Exp $ */
+/* $FreeBSD$ */
 	
 NON_GPROF_ENTRY(svr4_sigcode)
 	call	SVR4_SIGF_HANDLER(%esp)
diff --git a/sys/i386/svr4/svr4_machdep.c b/sys/i386/svr4/svr4_machdep.c
index 0c77505d58dab..611828981ee9a 100644
--- a/sys/i386/svr4/svr4_machdep.c
+++ b/sys/i386/svr4/svr4_machdep.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sys/i386/svr4/svr4_machdep.h b/sys/i386/svr4/svr4_machdep.h
index 06b808942c2f8..f183e60a47ac9 100644
--- a/sys/i386/svr4/svr4_machdep.h
+++ b/sys/i386/svr4/svr4_machdep.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_I386_SVR4_MACHDEP_H_
diff --git a/sys/i4b/driver/i4b_bsdi_ibc.c b/sys/i4b/driver/i4b_bsdi_ibc.c
index 91688154c1964..17d90c276f16f 100644
--- a/sys/i4b/driver/i4b_bsdi_ibc.c
+++ b/sys/i4b/driver/i4b_bsdi_ibc.c
@@ -30,7 +30,7 @@
  *	i4b_bsdi_ibc.c - isdn4bsd kernel BSD/OS point to point driver
  *	-------------------------------------------------------------
  *
- *	$Id: i4b_bsdi_ibc.c,v 1.1 1999/04/23 08:35:07 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Fri Apr 23 10:27:57 1999]
  *
diff --git a/sys/i4b/driver/i4b_ctl.c b/sys/i4b/driver/i4b_ctl.c
index afd34d7ddad3b..24c5f2737608d 100644
--- a/sys/i4b/driver/i4b_ctl.c
+++ b/sys/i4b/driver/i4b_ctl.c
@@ -27,7 +27,7 @@
  *	i4b_ctl.c - i4b system control port driver
  *	------------------------------------------
  *
- *	$Id: i4b_ctl.c,v 1.6 1999/08/06 14:02:02 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Tue Jun  8 09:27:15 1999]
  *
diff --git a/sys/i4b/driver/i4b_ipr.c b/sys/i4b/driver/i4b_ipr.c
index b2ac7d01fc237..b5944513cc940 100644
--- a/sys/i4b/driver/i4b_ipr.c
+++ b/sys/i4b/driver/i4b_ipr.c
@@ -27,7 +27,7 @@
  *	i4b_ipr.c - isdn4bsd IP over raw HDLC ISDN network driver
  *	---------------------------------------------------------
  *
- *	$Id: i4b_ipr.c,v 1.53 1999/07/22 18:30:15 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Thu Jul 22 19:46:53 1999]
  *
diff --git a/sys/i4b/driver/i4b_isppp.c b/sys/i4b/driver/i4b_isppp.c
index a2911d8b8d324..e3dcac43c58f5 100644
--- a/sys/i4b/driver/i4b_isppp.c
+++ b/sys/i4b/driver/i4b_isppp.c
@@ -34,7 +34,7 @@
  *	the "cx" driver for Cronyx's HDLC-in-hardware device).  This driver
  *	is only the glue between sppp and i4b.
  *
- *	$Id: i4b_isppp.c,v 1.34 1999/07/24 13:21:42 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Sat Jul 24 15:23:04 1999]
  *
diff --git a/sys/i4b/driver/i4b_rbch.c b/sys/i4b/driver/i4b_rbch.c
index 16d9de450ffd4..3852b5bbdd27b 100644
--- a/sys/i4b/driver/i4b_rbch.c
+++ b/sys/i4b/driver/i4b_rbch.c
@@ -27,7 +27,7 @@
  *	i4b_rbch.c - device driver for raw B channel data
  *	---------------------------------------------------
  *
- *	$Id: i4b_rbch.c,v 1.5 1999/08/06 14:02:04 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Fri Jul  9 09:37:02 1999]
  *
diff --git a/sys/i4b/driver/i4b_tel.c b/sys/i4b/driver/i4b_tel.c
index 4dd18c1972334..5e5c9c2a0efbd 100644
--- a/sys/i4b/driver/i4b_tel.c
+++ b/sys/i4b/driver/i4b_tel.c
@@ -27,7 +27,7 @@
  *	i4b_tel.c - device driver for ISDN telephony
  *	--------------------------------------------
  *
- *	$Id: i4b_tel.c,v 1.5 1999/08/06 14:02:04 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Fri Jul  9 08:35:30 1999]
  *
diff --git a/sys/i4b/driver/i4b_trace.c b/sys/i4b/driver/i4b_trace.c
index 528324102856c..ad02f2b653a13 100644
--- a/sys/i4b/driver/i4b_trace.c
+++ b/sys/i4b/driver/i4b_trace.c
@@ -27,7 +27,7 @@
  *	i4btrc - device driver for trace data read device
  *	---------------------------------------------------
  *
- *	$Id: i4b_trace.c,v 1.5 1999/08/06 14:02:04 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Tue Jun  1 12:15:40 1999]
  *
diff --git a/sys/i4b/include/i4b_cause.h b/sys/i4b/include/i4b_cause.h
index 3edf3ad1e142c..f94df0f9ca1c8 100644
--- a/sys/i4b/include/i4b_cause.h
+++ b/sys/i4b/include/i4b_cause.h
@@ -27,7 +27,7 @@
  *	i4b_cause.h - causes and cause handling for i4b
  *	-----------------------------------------------
  *
- *	$Id: i4b_cause.h,v 1.9 1999/02/14 09:45:02 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Sun Feb 14 10:37:46 1999]
  *
diff --git a/sys/i4b/include/i4b_debug.h b/sys/i4b/include/i4b_debug.h
index 980bb0ae1d347..e2f1ee17f5836 100644
--- a/sys/i4b/include/i4b_debug.h
+++ b/sys/i4b/include/i4b_debug.h
@@ -27,7 +27,7 @@
  *	i4b_debug.h - i4b debug header file
  *	-----------------------------------
  *
- *	$Id: i4b_debug.h,v 1.19 1999/05/28 15:03:32 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Fri May 28 16:27:07 1999]
  *
diff --git a/sys/i4b/include/i4b_global.h b/sys/i4b/include/i4b_global.h
index b13ac0e558d65..c5c852d3348ef 100644
--- a/sys/i4b/include/i4b_global.h
+++ b/sys/i4b/include/i4b_global.h
@@ -27,7 +27,7 @@
  *	i4b_global.h - i4b global include file
  *	--------------------------------------
  *
- *	$Id: i4b_global.h,v 1.21 1999/04/26 10:16:54 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Mon Apr 26 11:10:26 1999]
  *
diff --git a/sys/i4b/include/i4b_ioctl.h b/sys/i4b/include/i4b_ioctl.h
index 2f6c7530990a8..785379f2549cb 100644
--- a/sys/i4b/include/i4b_ioctl.h
+++ b/sys/i4b/include/i4b_ioctl.h
@@ -27,7 +27,7 @@
  *	i4b_ioctl.h - messages kernel <--> userland
  *	-------------------------------------------
  *
- *	$Id: i4b_ioctl.h,v 1.125 1999/07/30 07:02:11 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Fri Jul 30 08:53:47 1999]
  *
diff --git a/sys/i4b/include/i4b_isdnq931.h b/sys/i4b/include/i4b_isdnq931.h
index 15d06eec5ee0c..0a85a7081f5b1 100644
--- a/sys/i4b/include/i4b_isdnq931.h
+++ b/sys/i4b/include/i4b_isdnq931.h
@@ -27,7 +27,7 @@
  *	i4b_isdnq931.h - DSS1 layer 3 message types
  *	-------------------------------------------
  *
- *	$Id: i4b_isdnq931.h,v 1.5 1999/02/14 09:44:55 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Sun Feb 14 10:04:01 1999]
  *
diff --git a/sys/i4b/include/i4b_l1l2.h b/sys/i4b/include/i4b_l1l2.h
index 5ad09bd9e82f2..4386b7b3d6083 100644
--- a/sys/i4b/include/i4b_l1l2.h
+++ b/sys/i4b/include/i4b_l1l2.h
@@ -27,7 +27,7 @@
  *	i4b_l1l2.h - i4b layer 1 / layer 2 interactions
  *	---------------------------------------------------
  *
- *	$Id: i4b_l1l2.h,v 1.8 1999/02/14 09:44:55 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Sun Feb 14 10:04:07 1999]
  *
diff --git a/sys/i4b/include/i4b_l2l3.h b/sys/i4b/include/i4b_l2l3.h
index 4d4961208693d..6dee953098e8f 100644
--- a/sys/i4b/include/i4b_l2l3.h
+++ b/sys/i4b/include/i4b_l2l3.h
@@ -27,7 +27,7 @@
  *	i4b_l2l3.h - i4b layer 2 / layer 3 interactions
  *	-----------------------------------------------
  *
- *	$Id: i4b_l2l3.h,v 1.6 1999/02/14 09:44:55 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Sun Feb 14 10:04:13 1999]
  *
diff --git a/sys/i4b/include/i4b_l3l4.h b/sys/i4b/include/i4b_l3l4.h
index 3655bb1e5b43a..9a09838c41907 100644
--- a/sys/i4b/include/i4b_l3l4.h
+++ b/sys/i4b/include/i4b_l3l4.h
@@ -27,7 +27,7 @@
  *	i4b_l3l4.h - layer 3 / layer 4 interface
  *	------------------------------------------
  *
- *	$Id: i4b_l3l4.h,v 1.24 1999/03/18 14:33:40 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Wed Mar 17 16:16:40 1999]
  *
diff --git a/sys/i4b/include/i4b_mbuf.h b/sys/i4b/include/i4b_mbuf.h
index 0d63abbbc3aa8..0604c33e94dc0 100644
--- a/sys/i4b/include/i4b_mbuf.h
+++ b/sys/i4b/include/i4b_mbuf.h
@@ -27,7 +27,7 @@
  *	i4b - mbuf handling support routines
  *	--------------------------------------
  *
- *	$Id: i4b_mbuf.h,v 1.7 1999/02/14 09:44:55 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Sun Feb 14 10:04:26 1999]
  *
diff --git a/sys/i4b/include/i4b_rbch_ioctl.h b/sys/i4b/include/i4b_rbch_ioctl.h
index 97bdb90f68448..62d2829b8b83d 100644
--- a/sys/i4b/include/i4b_rbch_ioctl.h
+++ b/sys/i4b/include/i4b_rbch_ioctl.h
@@ -27,7 +27,7 @@
  *	i4b_rbch_ioctl.h raw B-channel driver interface ioctls
  *	------------------------------------------------------
  *
- *	$Id: i4b_rbch_ioctl.h,v 1.1 1999/07/09 06:44:00 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Fri Jul  9 08:35:07 1999]
  *
diff --git a/sys/i4b/include/i4b_tel_ioctl.h b/sys/i4b/include/i4b_tel_ioctl.h
index 07fcde86df635..0f1004acae30e 100644
--- a/sys/i4b/include/i4b_tel_ioctl.h
+++ b/sys/i4b/include/i4b_tel_ioctl.h
@@ -27,7 +27,7 @@
  *	i4b_tel_ioctl.h telephony interface ioctls
  *	------------------------------------------
  *
- *	$Id: i4b_tel_ioctl.h,v 1.10 1999/07/09 06:44:00 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Fri Jul  9 08:34:28 1999]
  *
diff --git a/sys/i4b/include/i4b_trace.h b/sys/i4b/include/i4b_trace.h
index 5b9a7307dd1c3..3001e6466ee85 100644
--- a/sys/i4b/include/i4b_trace.h
+++ b/sys/i4b/include/i4b_trace.h
@@ -27,7 +27,7 @@
  *	i4b_trace.h - header file for trace data read device
  *	----------------------------------------------------
  *
- *	$Id: i4b_trace.h,v 1.6 1999/02/14 09:45:02 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:39:26 1999]
  *
diff --git a/sys/i4b/layer1/i4b_asuscom_ipac.c b/sys/i4b/layer1/i4b_asuscom_ipac.c
index 5018e0852912b..59f4211d7dd1e 100644
--- a/sys/i4b/layer1/i4b_asuscom_ipac.c
+++ b/sys/i4b/layer1/i4b_asuscom_ipac.c
@@ -39,7 +39,7 @@
  *	code is modeled after Linux i4l driver written by Karsten
  *	Keil.
  *
- *	$Id: i4b_asuscom_ipac.c,v 1.1 1999/07/05 13:46:46 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Mon May 31 20:53:17 EEST 1999]
  *
diff --git a/sys/i4b/layer1/i4b_avm_a1.c b/sys/i4b/layer1/i4b_avm_a1.c
index 0d2015673d21c..8cb1ec1a5f093 100644
--- a/sys/i4b/layer1/i4b_avm_a1.c
+++ b/sys/i4b/layer1/i4b_avm_a1.c
@@ -35,7 +35,7 @@
  *	i4b_avm_a1.c - AVM A1/Fritz passive card driver for isdn4bsd
  *	------------------------------------------------------------
  *
- *	$Id: i4b_avm_a1.c,v 1.21 1999/02/14 09:44:58 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:25:11 1999]
  *
diff --git a/sys/i4b/layer1/i4b_avm_fritz_pci.c b/sys/i4b/layer1/i4b_avm_fritz_pci.c
index b9b3395a09328..0b41c7bea1299 100644
--- a/sys/i4b/layer1/i4b_avm_fritz_pci.c
+++ b/sys/i4b/layer1/i4b_avm_fritz_pci.c
@@ -35,7 +35,7 @@
  *	Fritz!Card PCI specific routines for isic driver
  *	------------------------------------------------
  *
- *	$Id: i4b_avm_fritz_pci.c,v 1.3 1999/08/06 14:02:12 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Tue Jun  1 14:08:01 1999]
  *
diff --git a/sys/i4b/layer1/i4b_avm_fritz_pcmcia.c b/sys/i4b/layer1/i4b_avm_fritz_pcmcia.c
index a6f0ad880f395..575da1abd0fc7 100644
--- a/sys/i4b/layer1/i4b_avm_fritz_pcmcia.c
+++ b/sys/i4b/layer1/i4b_avm_fritz_pcmcia.c
@@ -33,7 +33,7 @@
  *	Fritz!Card pcmcia specific routines for isic driver
  *	---------------------------------------------------
  *
- *	$Id: i4b_avm_fritz_pcmcia.c,v 1.12 1999/05/03 08:48:25 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun May  2 12:01:16 1999]
  *
diff --git a/sys/i4b/layer1/i4b_avm_fritz_pnp.c b/sys/i4b/layer1/i4b_avm_fritz_pnp.c
index 8da5e0082d0c6..a411c8cb13202 100644
--- a/sys/i4b/layer1/i4b_avm_fritz_pnp.c
+++ b/sys/i4b/layer1/i4b_avm_fritz_pnp.c
@@ -38,7 +38,7 @@
  *	Fritz!Card PnP specific routines for isic driver
  *	------------------------------------------------
  *
- *	$Id: i4b_avm_fritz_pnp.c,v 1.1 1999/08/06 14:02:13 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Thu 10 Jun 08:50:28 CEST 1999]
  *
diff --git a/sys/i4b/layer1/i4b_bchan.c b/sys/i4b/layer1/i4b_bchan.c
index bd9dfd0ae8719..24f0aec4c9754 100644
--- a/sys/i4b/layer1/i4b_bchan.c
+++ b/sys/i4b/layer1/i4b_bchan.c
@@ -27,7 +27,7 @@
  *	i4b_bchan.c - B channel handling L1 procedures
  *	----------------------------------------------
  *
- *	$Id: i4b_bchan.c,v 1.32 1999/03/17 10:41:08 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Sun Feb 14 10:25:27 1999]
  *
diff --git a/sys/i4b/layer1/i4b_ctx_s0P.c b/sys/i4b/layer1/i4b_ctx_s0P.c
index b5314db2239b4..a651d6bf7d841 100644
--- a/sys/i4b/layer1/i4b_ctx_s0P.c
+++ b/sys/i4b/layer1/i4b_ctx_s0P.c
@@ -27,7 +27,7 @@
  *	isic - I4B Siemens ISDN Chipset Driver for Creatix PnP cards
  *	============================================================
  *
- *	$Id: i4b_ctx_s0P.c,v 1.18 1999/02/14 09:44:58 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:25:33 1999]
  *
diff --git a/sys/i4b/layer1/i4b_drn_ngo.c b/sys/i4b/layer1/i4b_drn_ngo.c
index 75aa9909996fb..cca3a5b912779 100644
--- a/sys/i4b/layer1/i4b_drn_ngo.c
+++ b/sys/i4b/layer1/i4b_drn_ngo.c
@@ -27,7 +27,7 @@
  *	i4b_drn_ngo.c - Dr. Neuhaus Niccy GO@ and SAGEM Cybermod
  *	--------------------------------------------------------
  *
- *	$Id: i4b_drn_ngo.c,v 1.20 1999/02/14 09:44:58 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Sun Feb 14 10:25:39 1999]
  *
diff --git a/sys/i4b/layer1/i4b_dynalink.c b/sys/i4b/layer1/i4b_dynalink.c
index 1f75302db4319..1e586ae002a41 100644
--- a/sys/i4b/layer1/i4b_dynalink.c
+++ b/sys/i4b/layer1/i4b_dynalink.c
@@ -33,7 +33,7 @@
  *	isdn4bsd layer1 driver for Dynalink IS64PH isdn TA
  *	==================================================
  *
- *	$Id: i4b_dynalink.c,v 1.10 1999/07/26 09:03:49 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Sun Feb 14 10:26:21 1999]
  *
diff --git a/sys/i4b/layer1/i4b_elsa_isdnmc.c b/sys/i4b/layer1/i4b_elsa_isdnmc.c
index 1924fceea19e2..2b43323c70d66 100644
--- a/sys/i4b/layer1/i4b_elsa_isdnmc.c
+++ b/sys/i4b/layer1/i4b_elsa_isdnmc.c
@@ -33,7 +33,7 @@
  *	ELSA MicroLink ISDN/MC card specific routines
  *	---------------------------------------------
  *
- *	$Id: i4b_elsa_isdnmc.c,v 1.4 1999/02/14 09:44:59 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Sun Feb 14 10:26:25 1999]
  *
diff --git a/sys/i4b/layer1/i4b_elsa_mcall.c b/sys/i4b/layer1/i4b_elsa_mcall.c
index 5ad56203d5ddd..e1792e2e2d3d3 100644
--- a/sys/i4b/layer1/i4b_elsa_mcall.c
+++ b/sys/i4b/layer1/i4b_elsa_mcall.c
@@ -33,7 +33,7 @@
  *	ELSA MicroLink MC/all card specific routines
  *	--------------------------------------------
  *
- *	$Id: i4b_elsa_mcall.c,v 1.2 1999/02/14 09:44:59 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Sun Feb 14 10:26:29 1999]
  *
diff --git a/sys/i4b/layer1/i4b_elsa_qs1i.c b/sys/i4b/layer1/i4b_elsa_qs1i.c
index 573bb8672a6b3..1dea51d676d67 100644
--- a/sys/i4b/layer1/i4b_elsa_qs1i.c
+++ b/sys/i4b/layer1/i4b_elsa_qs1i.c
@@ -27,7 +27,7 @@
  *	isic - I4B Siemens ISDN Chipset Driver for ELSA Quickstep 1000pro ISA
  *	=====================================================================
  *
- *	$Id: i4b_elsa_qs1i.c,v 1.15 1999/03/16 14:57:53 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Tue Mar 16 15:42:10 1999]
  *
diff --git a/sys/i4b/layer1/i4b_elsa_qs1p.c b/sys/i4b/layer1/i4b_elsa_qs1p.c
index 0cc0a01b7b9f4..3c80e68a6a704 100644
--- a/sys/i4b/layer1/i4b_elsa_qs1p.c
+++ b/sys/i4b/layer1/i4b_elsa_qs1p.c
@@ -27,7 +27,7 @@
  *	isic - I4B Siemens ISDN Chipset Driver for ELSA Quickstep 1000pro PCI
  *	=====================================================================
  *
- *	$Id: i4b_elsa_qs1p.c,v 1.6 1999/03/16 15:21:55 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Wed Mar 10 07:24:32 1999]
  *
diff --git a/sys/i4b/layer1/i4b_hscx.c b/sys/i4b/layer1/i4b_hscx.c
index 4ddf779736dbd..efa1e7b6f6962 100644
--- a/sys/i4b/layer1/i4b_hscx.c
+++ b/sys/i4b/layer1/i4b_hscx.c
@@ -27,7 +27,7 @@
  *	i4b - Siemens HSCX chip (B-channel) handling
  *	--------------------------------------------
  *
- *	$Id: i4b_hscx.c,v 1.42 1999/03/17 13:44:50 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Wed Mar 17 11:59:05 1999]
  *
diff --git a/sys/i4b/layer1/i4b_hscx.h b/sys/i4b/layer1/i4b_hscx.h
index b611bf9955b3f..ed4208ac4d45f 100644
--- a/sys/i4b/layer1/i4b_hscx.h
+++ b/sys/i4b/layer1/i4b_hscx.h
@@ -30,7 +30,7 @@
  *
  *---------------------------------------------------------------------------
  *
- *	$Id: i4b_hscx.h,v 1.4 1999/02/14 09:44:59 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:26:56 1999]
  *
diff --git a/sys/i4b/layer1/i4b_ipac.h b/sys/i4b/layer1/i4b_ipac.h
index e58c4b8bde0bf..4c2483e1feeb0 100644
--- a/sys/i4b/layer1/i4b_ipac.h
+++ b/sys/i4b/layer1/i4b_ipac.h
@@ -27,7 +27,7 @@
  *	i4b_ipac.h - definitions for the Siemens IPAC PSB2115 chip
  *	==========================================================
  *
- *	$Id: i4b_ipac.h,v 1.6 1999/06/08 08:13:00 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Tue Jun  8 09:53:26 1999]
  *
diff --git a/sys/i4b/layer1/i4b_isac.c b/sys/i4b/layer1/i4b_isac.c
index 71ec0c3120bbd..64d20e772f57e 100644
--- a/sys/i4b/layer1/i4b_isac.c
+++ b/sys/i4b/layer1/i4b_isac.c
@@ -27,7 +27,7 @@
  *	i4b_isac.c - i4b siemens isdn chipset driver ISAC handler
  *	---------------------------------------------------------
  *
- *	$Id: i4b_isac.c,v 1.30 1999/02/14 19:51:01 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:27:09 1999]
  *
diff --git a/sys/i4b/layer1/i4b_isac.h b/sys/i4b/layer1/i4b_isac.h
index 942b9cc4dad87..82fb523ad0aca 100644
--- a/sys/i4b/layer1/i4b_isac.h
+++ b/sys/i4b/layer1/i4b_isac.h
@@ -30,7 +30,7 @@
  *
  *---------------------------------------------------------------------------
  *
- *	$Id: i4b_isac.h,v 1.6 1999/02/14 09:44:59 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:27:13 1999]
  *
diff --git a/sys/i4b/layer1/i4b_isic.c b/sys/i4b/layer1/i4b_isic.c
index a2361b9866566..b1a141ed087cd 100644
--- a/sys/i4b/layer1/i4b_isic.c
+++ b/sys/i4b/layer1/i4b_isic.c
@@ -27,7 +27,7 @@
  *	i4b_isic.c - global isic stuff
  *	==============================
  *
- *	$Id: i4b_isic.c,v 1.51 1999/07/26 09:03:49 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Mon Jul 26 10:59:56 1999]
  *
diff --git a/sys/i4b/layer1/i4b_isic_isa.c b/sys/i4b/layer1/i4b_isic_isa.c
index ba927c40ddd60..c240a80e87254 100644
--- a/sys/i4b/layer1/i4b_isic_isa.c
+++ b/sys/i4b/layer1/i4b_isic_isa.c
@@ -27,7 +27,7 @@
  *	i4b_isic_isa.c - ISA bus interface
  *	==================================
  *
- *	$Id: i4b_isic_isa.c,v 1.24 1999/07/26 09:03:49 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Mon Jul 26 10:59:51 1999]
  *
diff --git a/sys/i4b/layer1/i4b_isic_pci.c b/sys/i4b/layer1/i4b_isic_pci.c
index f732dd1803092..59ef6d77e3b75 100644
--- a/sys/i4b/layer1/i4b_isic_pci.c
+++ b/sys/i4b/layer1/i4b_isic_pci.c
@@ -27,7 +27,7 @@
  *	i4b_isic_pci.c - PCI bus interface
  *	==================================
  *
- *	$Id: i4b_isic_pci.c,v 1.14 1999/04/28 04:12:51 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Wed Apr 21 09:57:37 1999]
  *
diff --git a/sys/i4b/layer1/i4b_isic_pcmcia.c b/sys/i4b/layer1/i4b_isic_pcmcia.c
index f6ceb5d2dab2d..bf32211afab6c 100644
--- a/sys/i4b/layer1/i4b_isic_pcmcia.c
+++ b/sys/i4b/layer1/i4b_isic_pcmcia.c
@@ -35,7 +35,7 @@
  *	i4b_isic_pcmcia.c - i4b FreeBSD PCMCIA support
  *	----------------------------------------------
  *
- *	$Id: i4b_isic_pcmcia.c,v 1.9 1999/04/27 09:49:49 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Mon Apr 26 10:52:57 1999]
  *
diff --git a/sys/i4b/layer1/i4b_isic_pnp.c b/sys/i4b/layer1/i4b_isic_pnp.c
index 0e534eb58ff6a..e83061a7eb428 100644
--- a/sys/i4b/layer1/i4b_isic_pnp.c
+++ b/sys/i4b/layer1/i4b_isic_pnp.c
@@ -37,7 +37,7 @@
  *	i4b_isic_pnp.c - i4b pnp support
  *	--------------------------------
  *
- *	$Id: i4b_isic_pnp.c,v 1.23 1999/07/05 14:00:04 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Mon Jul  5 15:57:01 1999]
  *
diff --git a/sys/i4b/layer1/i4b_itk_ix1.c b/sys/i4b/layer1/i4b_itk_ix1.c
index c46af2b6ca844..9ec4cf3c0e780 100644
--- a/sys/i4b/layer1/i4b_itk_ix1.c
+++ b/sys/i4b/layer1/i4b_itk_ix1.c
@@ -26,7 +26,7 @@
  *	i4b_itk_ix1.c - ITK ix1 micro passive card driver for isdn4bsd
  *	--------------------------------------------------------------
  *
- *	$Id: i4b_itk_ix1.c,v 1.3 1999/02/14 09:44:59 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Sun Feb 14 10:28:00 1999]
  *
diff --git a/sys/i4b/layer1/i4b_l1.c b/sys/i4b/layer1/i4b_l1.c
index 79774bb313c17..847bb4fbb056e 100644
--- a/sys/i4b/layer1/i4b_l1.c
+++ b/sys/i4b/layer1/i4b_l1.c
@@ -27,7 +27,7 @@
  *	i4b_l1.c - isdn4bsd layer 1 handler
  *	-----------------------------------
  *
- *	$Id: i4b_l1.c,v 1.29 1999/02/14 19:51:02 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:28:10 1999]
  *
diff --git a/sys/i4b/layer1/i4b_l1.h b/sys/i4b/layer1/i4b_l1.h
index f013bbbea3d34..3bf196f9da82b 100644
--- a/sys/i4b/layer1/i4b_l1.h
+++ b/sys/i4b/layer1/i4b_l1.h
@@ -27,7 +27,7 @@
  *	i4b_l1.h - isdn4bsd layer 1 header file
  *	---------------------------------------
  *
- *	$Id: i4b_l1.h,v 1.64 1999/07/05 13:46:46 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Mon Jul  5 15:32:02 1999]
  *
diff --git a/sys/i4b/layer1/i4b_l1fsm.c b/sys/i4b/layer1/i4b_l1fsm.c
index f4134e405bd9c..142cff3d80810 100644
--- a/sys/i4b/layer1/i4b_l1fsm.c
+++ b/sys/i4b/layer1/i4b_l1fsm.c
@@ -27,7 +27,7 @@
  *	i4b_l1fsm.c - isdn4bsd layer 1 I.430 state machine
  *	--------------------------------------------------
  *
- *	$Id: i4b_l1fsm.c,v 1.28 1999/02/14 19:51:02 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:28:26 1999]
  *
diff --git a/sys/i4b/layer1/i4b_siemens_isurf.c b/sys/i4b/layer1/i4b_siemens_isurf.c
index 09e6f471d46c1..ed48a66d53e63 100644
--- a/sys/i4b/layer1/i4b_siemens_isurf.c
+++ b/sys/i4b/layer1/i4b_siemens_isurf.c
@@ -37,7 +37,7 @@
  *	Siemens I-Surf 2.0 PnP specific routines for isic driver
  *	--------------------------------------------------------
  *
- *	$Id: i4b_siemens_isurf.c,v 1.2 1999/07/05 13:22:12 hm Exp $
+ * $FreeBSD$
  *
  *      last edit-date: [Mon 14 Jun 16:46:27 CEST 1999]
  *
diff --git a/sys/i4b/layer1/i4b_sws.c b/sys/i4b/layer1/i4b_sws.c
index 8de9245953891..4759762ce7699 100644
--- a/sys/i4b/layer1/i4b_sws.c
+++ b/sys/i4b/layer1/i4b_sws.c
@@ -47,7 +47,7 @@
  *		EXPERIMENTAL !!!!
  *		=================
  *
- *	$Id: i4b_sws.c,v 1.13 1999/02/14 09:44:59 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Sun Feb 14 10:28:31 1999]
  *
diff --git a/sys/i4b/layer1/i4b_tel_s016.c b/sys/i4b/layer1/i4b_tel_s016.c
index e62d6a16457a3..3a8424985ff4b 100644
--- a/sys/i4b/layer1/i4b_tel_s016.c
+++ b/sys/i4b/layer1/i4b_tel_s016.c
@@ -37,7 +37,7 @@
  *	isic - I4B Siemens ISDN Chipset Driver for Teles S0/16 and clones
  *	=================================================================
  *
- *	$Id: i4b_tel_s016.c,v 1.13 1999/02/14 09:45:00 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:28:38 1999]
  *
diff --git a/sys/i4b/layer1/i4b_tel_s0163.c b/sys/i4b/layer1/i4b_tel_s0163.c
index 4b6f1b532caa9..0d36135ce9e36 100644
--- a/sys/i4b/layer1/i4b_tel_s0163.c
+++ b/sys/i4b/layer1/i4b_tel_s0163.c
@@ -37,7 +37,7 @@
  *	isic - I4B Siemens ISDN Chipset Driver for Teles S0/16.3
  *	========================================================
  *
- *	$Id: i4b_tel_s0163.c,v 1.19 1999/07/26 09:03:25 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Mon Jul 26 10:59:38 1999]
  *
diff --git a/sys/i4b/layer1/i4b_tel_s08.c b/sys/i4b/layer1/i4b_tel_s08.c
index 8f4f284af42b3..7fb53e6392927 100644
--- a/sys/i4b/layer1/i4b_tel_s08.c
+++ b/sys/i4b/layer1/i4b_tel_s08.c
@@ -37,7 +37,7 @@
  *	isic - I4B Siemens ISDN Chipset Driver for Teles S0/8 and clones
  *	================================================================
  *
- *	$Id: i4b_tel_s08.c,v 1.14 1999/02/14 09:45:00 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:28:53 1999]
  *
diff --git a/sys/i4b/layer1/i4b_tel_s0P.c b/sys/i4b/layer1/i4b_tel_s0P.c
index f0315b0718229..afbc6a5ff5ffc 100644
--- a/sys/i4b/layer1/i4b_tel_s0P.c
+++ b/sys/i4b/layer1/i4b_tel_s0P.c
@@ -38,7 +38,7 @@
  *		EXPERIMENTAL !!!
  *		================
  *
- *	$Id: i4b_tel_s0P.c,v 1.14 1999/03/16 11:12:31 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Tue Mar 16 10:39:14 1999]
  *
diff --git a/sys/i4b/layer1/i4b_usr_sti.c b/sys/i4b/layer1/i4b_usr_sti.c
index d8b8792c73975..9c58ee816ba41 100644
--- a/sys/i4b/layer1/i4b_usr_sti.c
+++ b/sys/i4b/layer1/i4b_usr_sti.c
@@ -27,7 +27,7 @@
  *	i4b_usr_sti.c - USRobotics Sportster ISDN TA intern (Tina-pp)
  *	-------------------------------------------------------------
  *
- *	$Id: i4b_usr_sti.c,v 1.17 1999/02/14 09:45:00 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:29:05 1999]
  *
diff --git a/sys/i4b/layer1/isa_isic.c b/sys/i4b/layer1/isa_isic.c
index bd6b8c53ba865..c89bb5d2572c6 100644
--- a/sys/i4b/layer1/isa_isic.c
+++ b/sys/i4b/layer1/isa_isic.c
@@ -33,7 +33,7 @@
  *	isa_isic.c - ISA bus frontend for i4b_isic driver
  *	--------------------------------------------------
  *
- *	$Id: isa_isic.c,v 1.23 1999/07/19 14:40:47 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Mon Jul 19 16:39:02 1999]
  *
diff --git a/sys/i4b/layer1/isapnp_isic.c b/sys/i4b/layer1/isapnp_isic.c
index a90299542c941..a72189b73dff9 100644
--- a/sys/i4b/layer1/isapnp_isic.c
+++ b/sys/i4b/layer1/isapnp_isic.c
@@ -33,7 +33,7 @@
  *	isapnp_isic.c - ISA-P&P bus frontend for i4b_isic driver
  *	--------------------------------------------------------
  *
- *	$Id: isapnp_isic.c,v 1.11 1999/05/03 08:48:25 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun May  2 11:57:08 1999]
  *
diff --git a/sys/i4b/layer1/isic_supio.c b/sys/i4b/layer1/isic_supio.c
index 0a80fbb2595a1..709dbcee4f03a 100644
--- a/sys/i4b/layer1/isic_supio.c
+++ b/sys/i4b/layer1/isic_supio.c
@@ -38,7 +38,7 @@
  *	But we attach to the supio, so just see "isic" or "isicII".
  *	-----------------------------------------------------------
  *
- *	$Id: isic_supio.c,v 1.7 1999/03/24 10:09:03 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Mon Mar 22 22:49:20 MET 1999]
  *
diff --git a/sys/i4b/layer1/pci_isic.c b/sys/i4b/layer1/pci_isic.c
index 7e0a69988996f..a339c2a289bef 100644
--- a/sys/i4b/layer1/pci_isic.c
+++ b/sys/i4b/layer1/pci_isic.c
@@ -33,7 +33,7 @@
  *	pci_isic.c - pcmcia bus frontend for i4b_isic driver
  *	-------------------------------------------------------
  *
- *	$Id: pci_isic.c,v 1.3 1999/03/16 15:21:55 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Wed Mar 10 07:22:08 1999]
  *
diff --git a/sys/i4b/layer1/pci_isic.h b/sys/i4b/layer1/pci_isic.h
index 0ac1918c9dd7f..a19025c8aaf0b 100644
--- a/sys/i4b/layer1/pci_isic.h
+++ b/sys/i4b/layer1/pci_isic.h
@@ -33,7 +33,7 @@
  *	pci_isic.h - pci bus frontend for i4b_isic driver
  *	-------------------------------------------------
  *
- *	$Id: pci_isic.h,v 1.1 1999/05/03 08:52:05 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Wed Mar 10 07:22:08 1999]
  *
diff --git a/sys/i4b/layer1/pcmcia_isic.c b/sys/i4b/layer1/pcmcia_isic.c
index cb6ff4ce07d4b..d4e0f8ec6c09d 100644
--- a/sys/i4b/layer1/pcmcia_isic.c
+++ b/sys/i4b/layer1/pcmcia_isic.c
@@ -33,7 +33,7 @@
  *	pcmcia_isic.c - pcmcia bus frontend for i4b_isic driver
  *	-------------------------------------------------------
  *
- *	$Id: pcmcia_isic.c,v 1.5 1999/04/20 12:19:57 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Tue Apr 20 14:09:16 1999]
  *
diff --git a/sys/i4b/layer1/pcmcia_isic.h b/sys/i4b/layer1/pcmcia_isic.h
index d5953f01102f7..c5426bde0c87e 100644
--- a/sys/i4b/layer1/pcmcia_isic.h
+++ b/sys/i4b/layer1/pcmcia_isic.h
@@ -33,7 +33,7 @@
  *	pcmcia_isic.h - common definitions for pcmcia isic cards
  *	--------------------------------------------------------
  *
- *	$Id: pcmcia_isic.h,v 1.2 1999/02/14 09:45:00 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:29:33 1999]
  *
diff --git a/sys/i4b/layer2/i4b_iframe.c b/sys/i4b/layer2/i4b_iframe.c
index 3b3686cf4a4ca..a043d851340f6 100644
--- a/sys/i4b/layer2/i4b_iframe.c
+++ b/sys/i4b/layer2/i4b_iframe.c
@@ -27,7 +27,7 @@
  *	i4b_iframe.c - i frame handling routines
  *	------------------------------------------
  *
- *	$Id: i4b_iframe.c,v 1.20 1999/05/28 15:03:32 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Fri May 28 15:52:41 1999]
  *
diff --git a/sys/i4b/layer2/i4b_l2.c b/sys/i4b/layer2/i4b_l2.c
index f282dd45c5e2b..cee25ab9bbb60 100644
--- a/sys/i4b/layer2/i4b_l2.c
+++ b/sys/i4b/layer2/i4b_l2.c
@@ -27,7 +27,7 @@
  *      i4b_l2.c - ISDN layer 2 (Q.921)
  *	-------------------------------
  *
- *	$Id: i4b_l2.c,v 1.27 1999/05/28 15:03:32 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Fri May 28 16:15:39 1999]
  *
diff --git a/sys/i4b/layer2/i4b_l2.h b/sys/i4b/layer2/i4b_l2.h
index af0809f0c6579..0b838b0fd29d6 100644
--- a/sys/i4b/layer2/i4b_l2.h
+++ b/sys/i4b/layer2/i4b_l2.h
@@ -27,7 +27,7 @@
  *	i4b_l2.h - ISDN layer 2 (Q.921) definitions
  *	---------------------------------------------
  *
- *	$Id: i4b_l2.h,v 1.18 1999/05/28 15:03:32 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Fri May 28 15:51:17 1999]
  *
diff --git a/sys/i4b/layer2/i4b_l2fsm.c b/sys/i4b/layer2/i4b_l2fsm.c
index ea046622d5ab6..051c5b2a064da 100644
--- a/sys/i4b/layer2/i4b_l2fsm.c
+++ b/sys/i4b/layer2/i4b_l2fsm.c
@@ -27,7 +27,7 @@
  *	i4b_l2fsm.c - layer 2 FSM
  *	-------------------------
  *
- *	$Id: i4b_l2fsm.c,v 1.15 1999/03/16 15:29:06 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Tue Mar 16 16:27:12 1999]
  *
diff --git a/sys/i4b/layer2/i4b_l2fsm.h b/sys/i4b/layer2/i4b_l2fsm.h
index 00b82d623fa47..ae3f6def3aa59 100644
--- a/sys/i4b/layer2/i4b_l2fsm.h
+++ b/sys/i4b/layer2/i4b_l2fsm.h
@@ -27,7 +27,7 @@
  *      i4b_l2fsm.h - layer 2 FSM
  *      -------------------------
  *
- *	$Id: i4b_l2fsm.h,v 1.4 1999/02/14 09:45:00 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:31:43 1999]
  *
diff --git a/sys/i4b/layer2/i4b_l2timer.c b/sys/i4b/layer2/i4b_l2timer.c
index 7a7db049fdbdc..50ace65d6caf1 100644
--- a/sys/i4b/layer2/i4b_l2timer.c
+++ b/sys/i4b/layer2/i4b_l2timer.c
@@ -27,7 +27,7 @@
  *	i4b_l2timer.c - layer 2 timer handling
  *	--------------------------------------
  *
- *	$Id: i4b_l2timer.c,v 1.15 1999/04/21 07:36:32 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Wed Apr 21 09:17:58 1999]
  *
diff --git a/sys/i4b/layer2/i4b_lme.c b/sys/i4b/layer2/i4b_lme.c
index 8c5059e18d7b0..cdfddee41cb1c 100644
--- a/sys/i4b/layer2/i4b_lme.c
+++ b/sys/i4b/layer2/i4b_lme.c
@@ -27,7 +27,7 @@
  *	i4b_lme.c - layer management entity
  *	-------------------------------------
  *
- *	$Id: i4b_lme.c,v 1.9 1999/02/14 09:45:00 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:31:55 1999]
  *
diff --git a/sys/i4b/layer2/i4b_mbuf.c b/sys/i4b/layer2/i4b_mbuf.c
index 9da6d40e6178d..21b12bb6eb25c 100644
--- a/sys/i4b/layer2/i4b_mbuf.c
+++ b/sys/i4b/layer2/i4b_mbuf.c
@@ -27,7 +27,7 @@
  *	i4b - mbuf handling support routines
  *	------------------------------------
  *
- *	$Id: i4b_mbuf.c,v 1.11 1999/02/14 09:45:00 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:32:00 1999]
  *
diff --git a/sys/i4b/layer2/i4b_sframe.c b/sys/i4b/layer2/i4b_sframe.c
index 59afdf69dfb12..309d952e36e8f 100644
--- a/sys/i4b/layer2/i4b_sframe.c
+++ b/sys/i4b/layer2/i4b_sframe.c
@@ -27,7 +27,7 @@
  *	i4b_sframe.c - s frame handling routines
  *	----------------------------------------
  *
- *	$Id: i4b_sframe.c,v 1.10 1999/05/28 15:03:32 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Fri May 28 16:14:04 1999]
  *
diff --git a/sys/i4b/layer2/i4b_tei.c b/sys/i4b/layer2/i4b_tei.c
index b0299186f348d..1ca81aa84b5e2 100644
--- a/sys/i4b/layer2/i4b_tei.c
+++ b/sys/i4b/layer2/i4b_tei.c
@@ -27,7 +27,7 @@
  *	i4b_tei.c - tei handling procedures
  *	-----------------------------------
  *
- *	$Id: i4b_tei.c,v 1.15 1999/05/28 15:03:32 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Fri May 28 16:14:14 1999]
  *
diff --git a/sys/i4b/layer2/i4b_uframe.c b/sys/i4b/layer2/i4b_uframe.c
index c27cfb8b256c4..127bb303ce364 100644
--- a/sys/i4b/layer2/i4b_uframe.c
+++ b/sys/i4b/layer2/i4b_uframe.c
@@ -27,7 +27,7 @@
  *	i4b_uframe.c - routines for handling U-frames
  *	-----------------------------------------------
  *
- *	$Id: i4b_uframe.c,v 1.8 1999/05/28 15:03:32 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Fri May 28 16:14:32 1999]
  *
diff --git a/sys/i4b/layer2/i4b_util.c b/sys/i4b/layer2/i4b_util.c
index 141bef08e1d5e..32666672aff1d 100644
--- a/sys/i4b/layer2/i4b_util.c
+++ b/sys/i4b/layer2/i4b_util.c
@@ -27,7 +27,7 @@
  *	i4b_util.c - layer 2 utility routines
  *	-------------------------------------
  *
- *	$Id: i4b_util.c,v 1.20 1999/04/15 09:53:55 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Thu Apr 15 10:47:52 1999]
  *
diff --git a/sys/i4b/layer3/i4b_l2if.c b/sys/i4b/layer3/i4b_l2if.c
index 36ca34c04f0cd..f5e3d320e79df 100644
--- a/sys/i4b/layer3/i4b_l2if.c
+++ b/sys/i4b/layer3/i4b_l2if.c
@@ -27,7 +27,7 @@
  *	i4b_l2if.c - Layer 3 interface to Layer 2
  *	-------------------------------------------
  *
- *	$Id: i4b_l2if.c,v 1.16 1999/05/25 10:05:40 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Tue May 25 11:55:15 1999]
  *
diff --git a/sys/i4b/layer3/i4b_l3.h b/sys/i4b/layer3/i4b_l3.h
index 66a40b6e7355f..32e6d806b8e97 100644
--- a/sys/i4b/layer3/i4b_l3.h
+++ b/sys/i4b/layer3/i4b_l3.h
@@ -27,7 +27,7 @@
  *	i4b_l3.h - layer 3 header file
  *	------------------------------
  *
- *	$Id: i4b_l3.h,v 1.9 1999/02/14 09:45:01 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:33:19 1999]
  *
diff --git a/sys/i4b/layer3/i4b_l3fsm.c b/sys/i4b/layer3/i4b_l3fsm.c
index a022bf8b866f4..6bc0e671458e9 100644
--- a/sys/i4b/layer3/i4b_l3fsm.c
+++ b/sys/i4b/layer3/i4b_l3fsm.c
@@ -27,7 +27,7 @@
  *	i4b_l3fsm.c - layer 3 FSM
  *	-------------------------
  *
- *	$Id: i4b_l3fsm.c,v 1.16 1999/04/21 07:50:31 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Wed Apr 21 09:42:26 1999]
  *
diff --git a/sys/i4b/layer3/i4b_l3fsm.h b/sys/i4b/layer3/i4b_l3fsm.h
index a7553d5d3cd77..3b46875e8ae40 100644
--- a/sys/i4b/layer3/i4b_l3fsm.h
+++ b/sys/i4b/layer3/i4b_l3fsm.h
@@ -27,7 +27,7 @@
  *      i4b_l3fsm.c - layer 3 FSM
  *      -------------------------
  * 
- *	$Id: i4b_l3fsm.h,v 1.6 1999/02/14 09:45:01 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:33:31 1999]
  *
diff --git a/sys/i4b/layer3/i4b_l3timer.c b/sys/i4b/layer3/i4b_l3timer.c
index a4a01bef7aa45..70c916d3a0aa3 100644
--- a/sys/i4b/layer3/i4b_l3timer.c
+++ b/sys/i4b/layer3/i4b_l3timer.c
@@ -27,7 +27,7 @@
  *	i4b_l3timer.c - timer and timeout handling for layer 3
  *	------------------------------------------------------
  *
- *	$Id: i4b_l3timer.c,v 1.12 1999/04/21 07:50:31 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Wed Apr 21 09:46:59 1999]
  *
diff --git a/sys/i4b/layer3/i4b_l4if.c b/sys/i4b/layer3/i4b_l4if.c
index 46210d66da486..fa6ea162b650b 100644
--- a/sys/i4b/layer3/i4b_l4if.c
+++ b/sys/i4b/layer3/i4b_l4if.c
@@ -27,7 +27,7 @@
  *	i4b_l4if.c - Layer 3 interface to Layer 4
  *	-------------------------------------------
  *
- *	$Id: i4b_l4if.c,v 1.19 1999/04/27 14:47:58 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Tue Apr 27 16:46:51 1999]
  *
diff --git a/sys/i4b/layer3/i4b_q931.c b/sys/i4b/layer3/i4b_q931.c
index 6e0256587ede4..cc6d9040c58cd 100644
--- a/sys/i4b/layer3/i4b_q931.c
+++ b/sys/i4b/layer3/i4b_q931.c
@@ -27,7 +27,7 @@
  *	i4b_q931.c - Q931 received messages handling
  *	--------------------------------------------
  *
- *	$Id: i4b_q931.c,v 1.21 1999/04/27 10:08:13 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Tue Apr 27 12:04:35 1999]
  *
diff --git a/sys/i4b/layer3/i4b_q931.h b/sys/i4b/layer3/i4b_q931.h
index 8c7a8a82dfa54..376d5ffb91ef3 100644
--- a/sys/i4b/layer3/i4b_q931.h
+++ b/sys/i4b/layer3/i4b_q931.h
@@ -27,7 +27,7 @@
  *	i4b_q931.h - Q931 handling header file
  *	--------------------------------------
  *
- *	$Id: i4b_q931.h,v 1.6 1999/02/14 09:45:02 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:33:56 1999]
  *
diff --git a/sys/i4b/layer3/i4b_q932fac.c b/sys/i4b/layer3/i4b_q932fac.c
index fc28f9fcbd4be..e180b9d24970c 100644
--- a/sys/i4b/layer3/i4b_q932fac.c
+++ b/sys/i4b/layer3/i4b_q932fac.c
@@ -27,7 +27,7 @@
  *	i4b_q932fac.c - Q932 facility handling
  *	--------------------------------------
  *
- *	$Id: i4b_q932fac.c,v 1.6 1999/02/14 09:45:02 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:34:02 1999]
  *
diff --git a/sys/i4b/layer3/i4b_q932fac.h b/sys/i4b/layer3/i4b_q932fac.h
index 7e83fce46f3c0..4e745ea4a7333 100644
--- a/sys/i4b/layer3/i4b_q932fac.h
+++ b/sys/i4b/layer3/i4b_q932fac.h
@@ -27,7 +27,7 @@
  *	i4b_q932fac.h - Q932 facility handling header file
  *	--------------------------------------------------
  *
- *	$Id: i4b_q932fac.h,v 1.6 1999/02/14 09:45:02 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:34:08 1999]
  *
diff --git a/sys/i4b/layer4/i4b_i4bdrv.c b/sys/i4b/layer4/i4b_i4bdrv.c
index fb2d129a88433..19a2fbaa7b0d8 100644
--- a/sys/i4b/layer4/i4b_i4bdrv.c
+++ b/sys/i4b/layer4/i4b_i4bdrv.c
@@ -27,7 +27,7 @@
  *	i4b_i4bdrv.c - i4b userland interface driver
  *	--------------------------------------------
  *
- *	$Id: i4b_i4bdrv.c,v 1.7 1999/08/06 14:02:45 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Tue Jun  8 19:48:16 1999]
  *
diff --git a/sys/i4b/layer4/i4b_l4.c b/sys/i4b/layer4/i4b_l4.c
index 33960856597f7..60cf4dc341239 100644
--- a/sys/i4b/layer4/i4b_l4.c
+++ b/sys/i4b/layer4/i4b_l4.c
@@ -27,7 +27,7 @@
  *	i4b_l4.c - kernel interface to userland
  *	-----------------------------------------
  *
- *	$Id: i4b_l4.c,v 1.39 1999/04/08 16:37:56 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Thu Apr  8 17:31:52 1999]
  *
diff --git a/sys/i4b/layer4/i4b_l4.h b/sys/i4b/layer4/i4b_l4.h
index 5d011b416935a..0225137d6fee0 100644
--- a/sys/i4b/layer4/i4b_l4.h
+++ b/sys/i4b/layer4/i4b_l4.h
@@ -27,7 +27,7 @@
  *	i4b_l4.h - kernel interface to userland header file
  *	---------------------------------------------------
  *
- *	$Id: i4b_l4.h,v 1.15 1999/03/18 14:33:41 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Wed Mar 17 16:20:10 1999]
  *
diff --git a/sys/i4b/layer4/i4b_l4mgmt.c b/sys/i4b/layer4/i4b_l4mgmt.c
index 6090f297269ac..aff1ecaee74e9 100644
--- a/sys/i4b/layer4/i4b_l4mgmt.c
+++ b/sys/i4b/layer4/i4b_l4mgmt.c
@@ -27,7 +27,7 @@
  *	i4b_l4mgmt.c - layer 4 calldescriptor management utilites
  *	-----------------------------------------------------------
  *
- *	$Id: i4b_l4mgmt.c,v 1.24 1999/02/14 09:45:02 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Sun Feb 14 10:35:13 1999]
  *
diff --git a/sys/i4b/layer4/i4b_l4timer.c b/sys/i4b/layer4/i4b_l4timer.c
index 02bd758f5be4d..fefb25d3f2a94 100644
--- a/sys/i4b/layer4/i4b_l4timer.c
+++ b/sys/i4b/layer4/i4b_l4timer.c
@@ -27,7 +27,7 @@
  *	i4b_l4timer.c - timer and timeout handling for layer 4
  *	--------------------------------------------------------
  *
- *	$Id: i4b_l4timer.c,v 1.13 1999/04/21 07:50:31 hm Exp $ 
+ * $FreeBSD$ 
  *
  *      last edit-date: [Wed Apr 21 09:49:08 1999]
  *
diff --git a/sys/i4b/tina-dd/i4b_tina_dd.c b/sys/i4b/tina-dd/i4b_tina_dd.c
index aba50027556d2..f6d343f313733 100644
--- a/sys/i4b/tina-dd/i4b_tina_dd.c
+++ b/sys/i4b/tina-dd/i4b_tina_dd.c
@@ -28,7 +28,7 @@
  *	i4b_tina_dd.c - i4b Stollman Tina-dd control device driver
  *	----------------------------------------------------------
  *
- *	$Id: i4b_tina_dd.c,v 1.2 1999/01/12 11:05:03 eivind Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Sat Dec  5 18:41:38 1998]
  *
diff --git a/sys/i4b/tina-dd/i4b_tina_ioctl.h b/sys/i4b/tina-dd/i4b_tina_ioctl.h
index d51f16d731a4a..ec422f0b1df62 100644
--- a/sys/i4b/tina-dd/i4b_tina_ioctl.h
+++ b/sys/i4b/tina-dd/i4b_tina_ioctl.h
@@ -31,7 +31,7 @@
  *	i4b_tina_ioctl.h - i4b Stollman Tina-dd ioctl header file
  *	---------------------------------------------------------
  *
- *	$Id: i4b_tina_ioctl.h,v 1.2 1998/12/05 18:06:20 hm Exp $
+ * $FreeBSD$
  *
  *	last edit-date: [Sat Dec  5 18:41:51 1998]
  *
diff --git a/sys/isa/atkbd_isa.c b/sys/isa/atkbd_isa.c
index a8d638121b1d1..f686170ec9497 100644
--- a/sys/isa/atkbd_isa.c
+++ b/sys/isa/atkbd_isa.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: atkbd_isa.c,v 1.4 1999/05/08 21:59:28 dfr Exp $
+ * $FreeBSD$
  */
 
 #include "atkbd.h"
diff --git a/sys/isa/atkbdc_isa.c b/sys/isa/atkbdc_isa.c
index 387f9a534153b..eae6e14fec840 100644
--- a/sys/isa/atkbdc_isa.c
+++ b/sys/isa/atkbdc_isa.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: atkbdc_isa.c,v 1.9 1999/06/29 17:35:09 yokota Exp $
+ * $FreeBSD$
  */
 
 #include "atkbdc.h"
diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c
index 188e20bc0f474..8a3e1c93030c8 100644
--- a/sys/isa/atrtc.c
+++ b/sys/isa/atrtc.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.142 1999/07/29 01:20:47 green Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/isa/bt_isa.c b/sys/isa/bt_isa.c
index 6a45d50a2de5e..b51fe8eb9ed87 100644
--- a/sys/isa/bt_isa.c
+++ b/sys/isa/bt_isa.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bt_isa.c,v 1.15 1999/06/28 09:19:58 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/isa/fd.c b/sys/isa/fd.c
index c2670fdea6558..ce2ea33bc405e 100644
--- a/sys/isa/fd.c
+++ b/sys/isa/fd.c
@@ -47,7 +47,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.153 1999/08/23 20:58:59 phk Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/isa/fdc.h b/sys/isa/fdc.h
index 83e291f98131e..c1a4470514ab2 100644
--- a/sys/isa/fdc.h
+++ b/sys/isa/fdc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fdc.h,v 1.13 1999/01/15 09:15:27 bde Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/isa/fdreg.h b/sys/isa/fdreg.h
index 7fef8ad098d4c..4d01c4121cea0 100644
--- a/sys/isa/fdreg.h
+++ b/sys/isa/fdreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)fdreg.h	7.1 (Berkeley) 5/9/91
- *	$Id: fdreg.h,v 1.10 1997/02/22 09:36:11 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/isa/ic/esp.h b/sys/isa/ic/esp.h
index 6621e6503917c..a381ee7d22aae 100644
--- a/sys/isa/ic/esp.h
+++ b/sys/isa/ic/esp.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _IC_ESP_H_
diff --git a/sys/isa/ic/nec765.h b/sys/isa/ic/nec765.h
index 3a5561888e874..c08b73b7d6003 100644
--- a/sys/isa/ic/nec765.h
+++ b/sys/isa/ic/nec765.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)nec765.h	7.1 (Berkeley) 5/9/91
- *	$Id: nec765.h,v 1.6 1997/02/22 09:38:04 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/isa/ic/ns16550.h b/sys/isa/ic/ns16550.h
index ba338886c764b..e8fad7da832e8 100644
--- a/sys/isa/ic/ns16550.h
+++ b/sys/isa/ic/ns16550.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ns16550.h	7.1 (Berkeley) 5/9/91
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/isa/isa_common.c b/sys/isa/isa_common.c
index e1106ca8d265d..c16b6632f1a5b 100644
--- a/sys/isa/isa_common.c
+++ b/sys/isa/isa_common.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: isa_common.c,v 1.4 1999/07/29 01:02:56 mdodd Exp $
+ * $FreeBSD$
  */
 /*
  * Modifications for Intel architecture by Garrett A. Wollman.
diff --git a/sys/isa/isa_common.h b/sys/isa/isa_common.h
index 844799243e2b7..c63f1efac8627 100644
--- a/sys/isa/isa_common.h
+++ b/sys/isa/isa_common.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: isa_common.h,v 1.1 1999/05/22 15:18:25 dfr Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/isa/isa_if.m b/sys/isa/isa_if.m
index 72daf4a8768ca..051b0dee11aa8 100644
--- a/sys/isa/isa_if.m
+++ b/sys/isa/isa_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id: isa_if.m,v 1.1 1999/05/22 15:18:26 dfr Exp $
+# $FreeBSD$
 #
 
 INTERFACE isa;
diff --git a/sys/isa/isahint.c b/sys/isa/isahint.c
index 31323ccfaaa1f..9bb333fb93c86 100644
--- a/sys/isa/isahint.c
+++ b/sys/isa/isahint.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: isahint.c,v 1.3 1999/05/28 09:25:00 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/isa/isareg.h b/sys/isa/isareg.h
index e15f7cd9875f4..a2162cd4dfcae 100644
--- a/sys/isa/isareg.h
+++ b/sys/isa/isareg.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- *	$Id: isareg.h,v 1.2 1999/01/06 05:49:30 yokota Exp $
+ * $FreeBSD$
  */
 
 #ifdef PC98
diff --git a/sys/isa/isavar.h b/sys/isa/isavar.h
index 2f63e627d99e4..2d157aae08b7a 100644
--- a/sys/isa/isavar.h
+++ b/sys/isa/isavar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: isavar.h,v 1.8 1999/05/28 09:25:02 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _ISA_ISAVAR_H_
diff --git a/sys/isa/pnp.h b/sys/isa/pnp.h
index 049eb7bc5b8a2..cc50a1a00b77e 100644
--- a/sys/isa/pnp.h
+++ b/sys/isa/pnp.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  *      from: pnp.h,v 1.7 1998/09/13 22:15:44 eivind Exp
  */
 
diff --git a/sys/isa/ppc.c b/sys/isa/ppc.c
index 073eab558d8fe..436caebf84a21 100644
--- a/sys/isa/ppc.c
+++ b/sys/isa/ppc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppc.c,v 1.20 1999/02/14 22:02:47 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #include "ppc.h"
diff --git a/sys/isa/ppcreg.h b/sys/isa/ppcreg.h
index 3a61ae7675a95..faecb9771ff85 100644
--- a/sys/isa/ppcreg.h
+++ b/sys/isa/ppcreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppcreg.h,v 1.7 1999/01/10 16:41:13 nsouch Exp $
+ * $FreeBSD$
  *
  */
 #ifndef __PPCREG_H
diff --git a/sys/isa/psm.c b/sys/isa/psm.c
index e7c82c97dd477..6e861ccdba9c4 100644
--- a/sys/isa/psm.c
+++ b/sys/isa/psm.c
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: psm.c,v 1.16 1999/08/22 06:11:52 yokota Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/isa/rtc.h b/sys/isa/rtc.h
index ea187d9e186ea..6f78657db0e10 100644
--- a/sys/isa/rtc.h
+++ b/sys/isa/rtc.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)rtc.h	7.1 (Berkeley) 5/12/91
- *	$Id: rtc.h,v 1.10 1997/02/22 09:37:03 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _I386_ISA_RTC_H_
diff --git a/sys/isa/sio.c b/sys/isa/sio.c
index 7a8c247fe2a89..962074416053a 100644
--- a/sys/isa/sio.c
+++ b/sys/isa/sio.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sio.c,v 1.255 1999/08/09 11:02:38 phk Exp $
+ * $FreeBSD$
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.234
  */
diff --git a/sys/isa/sioreg.h b/sys/isa/sioreg.h
index cb7aa5fbd1980..0521065259982 100644
--- a/sys/isa/sioreg.h
+++ b/sys/isa/sioreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)comreg.h	7.2 (Berkeley) 5/9/91
- *	$Id: sioreg.h,v 1.11 1998/09/26 14:00:29 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/isa/syscons_isa.c b/sys/isa/syscons_isa.c
index 499a9026ac0f4..2f8111dfdccb5 100644
--- a/sys/isa/syscons_isa.c
+++ b/sys/isa/syscons_isa.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: syscons_isa.c,v 1.6 1999/06/24 09:06:48 yokota Exp $
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/isa/vga_isa.c b/sys/isa/vga_isa.c
index 813458e3531f1..decd080c42dce 100644
--- a/sys/isa/vga_isa.c
+++ b/sys/isa/vga_isa.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: vga_isa.c,v 1.10 1999/05/30 16:52:49 phk Exp $
+ * $FreeBSD$
  */
 
 #include "vga.h"
diff --git a/sys/isofs/cd9660/TODO b/sys/isofs/cd9660/TODO
index cf3fadc5d8829..b8d7f3efebb99 100644
--- a/sys/isofs/cd9660/TODO
+++ b/sys/isofs/cd9660/TODO
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
  2) should understand Rock Ridge
 
diff --git a/sys/isofs/cd9660/cd9660_bmap.c b/sys/isofs/cd9660/cd9660_bmap.c
index e787f83a98cc1..e5fcd9ab32b34 100644
--- a/sys/isofs/cd9660/cd9660_bmap.c
+++ b/sys/isofs/cd9660/cd9660_bmap.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_bmap.c	8.3 (Berkeley) 1/23/94
- * $Id: cd9660_bmap.c,v 1.6 1997/02/22 09:38:47 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_lookup.c b/sys/isofs/cd9660/cd9660_lookup.c
index 9713220483101..b9aabbc7e2b88 100644
--- a/sys/isofs/cd9660/cd9660_lookup.c
+++ b/sys/isofs/cd9660/cd9660_lookup.c
@@ -38,7 +38,7 @@
  *	from: @(#)ufs_lookup.c	7.33 (Berkeley) 5/19/91
  *
  *	@(#)cd9660_lookup.c	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_lookup.c,v 1.21 1999/01/27 21:49:54 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c
index ea22187acb743..d7093fe3fd7f1 100644
--- a/sys/isofs/cd9660/cd9660_node.c
+++ b/sys/isofs/cd9660/cd9660_node.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.c	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_node.c,v 1.27 1999/01/27 21:49:54 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_node.h b/sys/isofs/cd9660/cd9660_node.h
index 46e54466fb9aa..0409efe2d8177 100644
--- a/sys/isofs/cd9660/cd9660_node.h
+++ b/sys/isofs/cd9660/cd9660_node.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.h	8.6 (Berkeley) 5/14/95
- * $Id: cd9660_node.h,v 1.17 1998/02/03 21:39:30 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/isofs/cd9660/cd9660_rrip.c b/sys/isofs/cd9660/cd9660_rrip.c
index c4ad1d7b19a6d..b4f97a98e1123 100644
--- a/sys/isofs/cd9660/cd9660_rrip.c
+++ b/sys/isofs/cd9660/cd9660_rrip.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_rrip.c	8.6 (Berkeley) 12/5/94
- * $Id: cd9660_rrip.c,v 1.15 1999/05/11 19:54:24 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_rrip.h b/sys/isofs/cd9660/cd9660_rrip.h
index cacee390d0746..5008abf2a0acb 100644
--- a/sys/isofs/cd9660/cd9660_rrip.h
+++ b/sys/isofs/cd9660/cd9660_rrip.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_rrip.h	8.2 (Berkeley) 12/5/94
- * $Id: cd9660_rrip.h,v 1.3.2000.1 1996/09/30 12:46:48 dfr Exp $
+ * $FreeBSD$
  */
   
 typedef struct {
diff --git a/sys/isofs/cd9660/cd9660_util.c b/sys/isofs/cd9660/cd9660_util.c
index 21d4b9bbc343a..2a11dc2f63616 100644
--- a/sys/isofs/cd9660/cd9660_util.c
+++ b/sys/isofs/cd9660/cd9660_util.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_util.c	8.3 (Berkeley) 12/5/94
- * $Id: cd9660_util.c,v 1.11 1999/04/18 10:58:02 dcs Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index 59421d07a57f2..0ed30ed79da8e 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vfsops.c	8.18 (Berkeley) 5/22/95
- * $Id: cd9660_vfsops.c,v 1.60 1999/08/25 12:24:39 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index 86cd115b6634d..ee2528b2d8cc1 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vnops.c	8.19 (Berkeley) 5/27/95
- * $Id: cd9660_vnops.c,v 1.56 1999/05/11 19:54:25 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/isofs/cd9660/iso.h b/sys/isofs/cd9660/iso.h
index 5d211555e76ad..6a685d2465e99 100644
--- a/sys/isofs/cd9660/iso.h
+++ b/sys/isofs/cd9660/iso.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso.h	8.6 (Berkeley) 5/10/95
- * $Id: iso.h,v 1.16 1997/05/07 13:23:04 joerg Exp $
+ * $FreeBSD$
  */
 
 #define ISODCL(from, to) (to - from + 1)
diff --git a/sys/isofs/cd9660/iso_rrip.h b/sys/isofs/cd9660/iso_rrip.h
index 2b256d51eca02..0c06e98825ce7 100644
--- a/sys/isofs/cd9660/iso_rrip.h
+++ b/sys/isofs/cd9660/iso_rrip.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)iso_rrip.h	8.2 (Berkeley) 1/23/94
- * $Id: iso_rrip.h,v 1.4 1997/02/22 09:38:52 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/kern/bus_if.m b/sys/kern/bus_if.m
index 869639f074f1e..d701283a7718c 100644
--- a/sys/kern/bus_if.m
+++ b/sys/kern/bus_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id: bus_if.m,v 1.12 1999/07/11 13:42:36 dfr Exp $
+# $FreeBSD$
 #
 
 INTERFACE bus;
diff --git a/sys/kern/device_if.m b/sys/kern/device_if.m
index 181c5bfc000b4..1d6215bf85c5b 100644
--- a/sys/kern/device_if.m
+++ b/sys/kern/device_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id: device_if.m,v 1.5 1999/05/14 11:22:41 dfr Exp $
+# $FreeBSD$
 #
 
 INTERFACE device;
diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c
index df983dec2d2e6..0b3cbf5fc2037 100644
--- a/sys/kern/imgact_aout.c
+++ b/sys/kern/imgact_aout.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: imgact_aout.c,v 1.52 1999/05/17 00:53:36 alc Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
index 59f347c5eacf8..d58d2741860bd 100644
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: imgact_elf.c,v 1.61 1999/07/09 19:10:14 peter Exp $
+ * $FreeBSD$
  */
 
 #include "opt_rlimit.h"
diff --git a/sys/kern/imgact_gzip.c b/sys/kern/imgact_gzip.c
index 09e52f17b2652..f3c2e6001dff4 100644
--- a/sys/kern/imgact_gzip.c
+++ b/sys/kern/imgact_gzip.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: imgact_gzip.c,v 1.37 1999/05/09 16:04:09 peter Exp $
+ * $FreeBSD$
  *
  * This module handles execution of a.out files which have been run through
  * "gzip".  This saves diskspace, but wastes cpu-cycles and VM.
diff --git a/sys/kern/imgact_shell.c b/sys/kern/imgact_shell.c
index 4a6e6f7bb21c1..38bab6bf214e3 100644
--- a/sys/kern/imgact_shell.c
+++ b/sys/kern/imgact_shell.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: imgact_shell.c,v 1.18 1999/01/29 22:59:43 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/inflate.c b/sys/kern/inflate.c
index 1db9b2c99642a..f38e0bf077957 100644
--- a/sys/kern/inflate.c
+++ b/sys/kern/inflate.c
@@ -7,7 +7,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: inflate.c,v 1.11 1997/10/12 20:23:40 phk Exp $
+ * $FreeBSD$
  *
  *
  */
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 7791f7f3b9dfc..7a0e216ac69d6 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)init_main.c	8.9 (Berkeley) 1/21/94
- * $Id: init_main.c,v 1.124 1999/07/01 13:21:36 peter Exp $
+ * $FreeBSD$
  */
 
 #include "opt_init_path.h"
diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c
index f76c2e2191b14..3222b16682350 100644
--- a/sys/kern/kern_acct.c
+++ b/sys/kern/kern_acct.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_acct.c	8.1 (Berkeley) 6/14/93
- *	$Id: kern_acct.c,v 1.20 1999/04/27 11:15:53 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 18305494b612b..4d7b6a94e46c8 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.96 1999/07/18 15:07:18 bde Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ntp.h"
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index 2f865348c8b65..58dc63f944cac 100644
--- a/sys/kern/kern_conf.c
+++ b/sys/kern/kern_conf.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: kern_conf.c,v 1.59 1999/08/20 20:24:59 julian Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 653259694fb3d..7e718a24f3fbe 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_descrip.c	8.6 (Berkeley) 4/19/94
- * $Id: kern_descrip.c,v 1.65 1999/08/04 18:53:44 green Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c
index df235e46e8dd4..fb5d71fd075e2 100644
--- a/sys/kern/kern_environment.c
+++ b/sys/kern/kern_environment.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: kern_environment.c,v 1.5 1999/01/27 21:24:50 dillon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index ef105514faf25..6bb57e09a17ca 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: kern_exec.c,v 1.99 1999/04/27 11:15:55 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 10a54ac73ee7e..50e29b8ccd481 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_exit.c	8.7 (Berkeley) 2/12/94
- * $Id: kern_exit.c,v 1.81 1999/06/07 20:37:29 msmith Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 633e7e76beccc..c02dadf2f94a0 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_fork.c	8.6 (Berkeley) 4/8/94
- * $Id: kern_fork.c,v 1.63 1999/07/03 20:58:44 peter Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ktrace.h"
diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c
index 22565f73cd67e..1e46c79059b31 100644
--- a/sys/kern/kern_intr.c
+++ b/sys/kern/kern_intr.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: kern_intr.c,v 1.21 1998/11/10 09:16:29 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c
index e90a6897164c4..16fd0487ecd1b 100644
--- a/sys/kern/kern_jail.c
+++ b/sys/kern/kern_jail.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: malloc.c,v 1.44 1999/03/28 14:16:05 phk Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index 939888ec5786e..19e4a6ad9313f 100644
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_ktrace.c	8.2 (Berkeley) 9/23/93
- * $Id: kern_ktrace.c,v 1.26 1999/04/28 11:36:55 phk Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ktrace.h"
diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c
index 26c1f6bfab24b..8feb119b62859 100644
--- a/sys/kern/kern_linker.c
+++ b/sys/kern/kern_linker.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: kern_linker.c,v 1.35 1999/08/20 00:18:07 grog Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ddb.h"
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c
index 35f6567dabddc..2b2dfeb13c77c 100644
--- a/sys/kern/kern_lock.c
+++ b/sys/kern/kern_lock.c
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_lock.c	8.18 (Berkeley) 5/21/95
- * $Id: kern_lock.c,v 1.26 1999/06/26 02:46:00 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include "opt_lint.h"
diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c
index 21f38e2562de2..27bb5c49f6af0 100644
--- a/sys/kern/kern_lockf.c
+++ b/sys/kern/kern_lockf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_lockf.c	8.3 (Berkeley) 1/6/94
- * $Id: kern_lockf.c,v 1.22 1999/05/08 22:46:46 dt Exp $
+ * $FreeBSD$
  */
 
 #include "opt_debug_lockf.h"
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 4b3a42a4c587e..98098ad690598 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_malloc.c	8.3 (Berkeley) 1/4/94
- * $Id: kern_malloc.c,v 1.56 1999/05/12 11:11:27 bde Exp $
+ * $FreeBSD$
  */
 
 #include "opt_vm.h"
diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c
index aa69b24bd5d42..91940022e4884 100644
--- a/sys/kern/kern_mib.c
+++ b/sys/kern/kern_mib.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_sysctl.c	8.4 (Berkeley) 4/14/94
- * $Id: kern_mib.c,v 1.23 1999/08/08 18:42:48 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c
index 19dd2be31a664..c4e28a5842f13 100644
--- a/sys/kern/kern_module.c
+++ b/sys/kern/kern_module.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: kern_module.c,v 1.18 1999/05/20 00:00:58 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c
index a5a81722d5b3d..69130d68e9951 100644
--- a/sys/kern/kern_physio.c
+++ b/sys/kern/kern_physio.c
@@ -16,7 +16,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id: kern_physio.c,v 1.37 1999/08/21 06:48:16 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index a8e35e173a7cf..28e1f6d10b0ae 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_proc.c	8.7 (Berkeley) 2/14/95
- * $Id: kern_proc.c,v 1.53 1999/07/17 20:29:10 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c
index e4ad6f5c58012..5c2635046a4c1 100644
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_prot.c	8.6 (Berkeley) 1/21/94
- * $Id: kern_prot.c,v 1.46 1999/04/27 12:21:06 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/kern_random.c b/sys/kern/kern_random.c
index 4268375a057ca..c9c450fc4f027 100644
--- a/sys/kern/kern_random.c
+++ b/sys/kern/kern_random.c
@@ -1,7 +1,7 @@
 /*
  * random_machdep.c -- A strong random number generator
  *
- * $Id: random_machdep.c,v 1.30 1999/04/21 07:26:28 peter Exp $
+ * $FreeBSD$
  *
  * Version 0.95, last modified 18-Oct-95
  * 
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index 811ccf479b5f6..813a978534df5 100644
--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_resource.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_resource.c,v 1.47 1999/04/27 12:21:07 phk Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index 5583a250c0edf..5cd4f85135d57 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_shutdown.c	8.3 (Berkeley) 1/21/94
- * $Id: kern_shutdown.c,v 1.61 1999/08/21 06:24:20 msmith Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ddb.h"
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 0b4a89c18ef3d..49465fce8ba6b 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_sig.c	8.7 (Berkeley) 4/18/94
- * $Id: kern_sig.c,v 1.60 1999/08/16 18:13:38 billf Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index 73d7d2c8a092a..2b32e3d10c70b 100644
--- a/sys/kern/kern_subr.c
+++ b/sys/kern/kern_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_subr.c	8.3 (Berkeley) 1/21/94
- * $Id: kern_subr.c,v 1.28 1999/03/12 03:09:29 julian Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 17d3a6c63da30..be058daa54a7d 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_synch.c	8.9 (Berkeley) 5/19/95
- * $Id: kern_synch.c,v 1.76 1999/03/05 16:38:12 bde Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ktrace.h"
diff --git a/sys/kern/kern_syscalls.c b/sys/kern/kern_syscalls.c
index 562ad477b785e..3ba15ad4502a6 100644
--- a/sys/kern/kern_syscalls.c
+++ b/sys/kern/kern_syscalls.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *     $Id: kern_syscalls.c,v 1.3 1999/01/17 18:58:04 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index c6877f60344c4..af6c32aff393f 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_sysctl.c	8.4 (Berkeley) 4/14/94
- * $Id: kern_sysctl.c,v 1.88 1999/04/28 11:37:00 phk Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index 18305494b612b..4d7b6a94e46c8 100644
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.96 1999/07/18 15:07:18 bde Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ntp.h"
diff --git a/sys/kern/kern_threads.c b/sys/kern/kern_threads.c
index ba5b35d46c5a9..3531e2c6d361c 100644
--- a/sys/kern/kern_threads.c
+++ b/sys/kern/kern_threads.c
@@ -46,7 +46,7 @@
  * in Germany will I accept domestic beer.  This code may or may not work
  * and I certainly make no claims as to its fitness for *any* purpose.
  * 
- * $Id: kern_threads.c,v 1.13 1999/01/28 17:31:59 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index 880f972217668..032b0385981e9 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_time.c	8.1 (Berkeley) 6/10/93
- * $Id: kern_time.c,v 1.65 1999/04/27 11:16:07 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index c7d44016f1cf8..45bc266c567b6 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- *	$Id: kern_timeout.c,v 1.56 1999/03/06 04:46:19 wollman Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c
index 92b26cee0cea1..5009db2585f21 100644
--- a/sys/kern/kern_xxx.c
+++ b/sys/kern/kern_xxx.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_xxx.c	8.2 (Berkeley) 11/14/93
- * $Id: kern_xxx.c,v 1.29 1999/04/27 11:16:09 phk Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/link_aout.c b/sys/kern/link_aout.c
index e7955ec5d0afd..50d1e1c884521 100644
--- a/sys/kern/link_aout.c
+++ b/sys/kern/link_aout.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: link_aout.c,v 1.20 1999/05/08 13:03:47 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef __alpha__
diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c
index e30294e89c4e3..e481e2cfbbb0e 100644
--- a/sys/kern/link_elf.c
+++ b/sys/kern/link_elf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: link_elf.c,v 1.17 1999/05/08 13:03:49 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c
index e30294e89c4e3..e481e2cfbbb0e 100644
--- a/sys/kern/link_elf_obj.c
+++ b/sys/kern/link_elf_obj.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: link_elf.c,v 1.17 1999/05/08 13:03:49 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/makedevops.pl b/sys/kern/makedevops.pl
index 6c6ec306d31d8..85f6bc5284bc1 100644
--- a/sys/kern/makedevops.pl
+++ b/sys/kern/makedevops.pl
@@ -35,7 +35,7 @@
 # From @(#)makedevops.sh 1.1 1998/06/14 13:53:12 dfr Exp $
 # From @(#)makedevops.sh ?.? 1998/10/05
 #
-# $Id: makedevops.pl,v 1.9 1999/08/18 08:39:14 n_hibma Exp $
+# $FreeBSD$
 
 #
 # Script to produce device front-end sugar.
diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh
index 0cbd2475f9d1e..413d2b88f51de 100644
--- a/sys/kern/makesyscalls.sh
+++ b/sys/kern/makesyscalls.sh
@@ -1,6 +1,6 @@
 #! /bin/sh -
 #	@(#)makesyscalls.sh	8.1 (Berkeley) 6/10/93
-# $Id: makesyscalls.sh,v 1.34 1998/06/09 03:32:05 bde Exp $
+# $FreeBSD$
 
 set -e
 
diff --git a/sys/kern/md5c.c b/sys/kern/md5c.c
index d6175ee113672..c4e3791f53422 100644
--- a/sys/kern/md5c.c
+++ b/sys/kern/md5c.c
@@ -22,7 +22,7 @@
  * These notices must be retained in any copies of any part of this
  * documentation and/or software.
  *
- * $Id: md5c.c,v 1.14 1998/05/01 16:40:19 bde Exp $
+ * $FreeBSD$
  *
  * This code is the same as the code published by RSA Inc.  It has been
  * edited for clarity and style only.
diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c
index 3e90dc5a5031c..4de4ee940e431 100644
--- a/sys/kern/subr_autoconf.c
+++ b/sys/kern/subr_autoconf.c
@@ -41,7 +41,7 @@
  *
  *	@(#)subr_autoconf.c	8.1 (Berkeley) 6/10/93
  *
- * $Id: subr_autoconf.c,v 1.10 1999/04/17 09:12:35 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_blist.c b/sys/kern/subr_blist.c
index 79dc27c22a71b..080bec7948130 100644
--- a/sys/kern/subr_blist.c
+++ b/sys/kern/subr_blist.c
@@ -60,7 +60,7 @@
  *
  *	This code can be compiled stand-alone for debugging.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifdef KERNEL
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index 27e280e6a3008..d03e65685c498 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: subr_bus.c,v 1.38 1999/08/14 13:32:25 n_hibma Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_clist.c b/sys/kern/subr_clist.c
index b1e5edaa5c37d..a7d1daf79e8e6 100644
--- a/sys/kern/subr_clist.c
+++ b/sys/kern/subr_clist.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: tty_subr.c,v 1.30 1998/07/15 02:32:12 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/subr_devstat.c b/sys/kern/subr_devstat.c
index 18c3fcb1efd40..448b869c47c73 100644
--- a/sys/kern/subr_devstat.c
+++ b/sys/kern/subr_devstat.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: subr_devstat.c,v 1.10 1999/04/11 02:27:06 eivind Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c
index a46e11ab7b0c0..a52efbd9ef573 100644
--- a/sys/kern/subr_disklabel.c
+++ b/sys/kern/subr_disklabel.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_disksubr.c	8.5 (Berkeley) 1/21/94
- * $Id: ufs_disksubr.c,v 1.40 1999/06/26 02:46:44 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_diskmbr.c b/sys/kern/subr_diskmbr.c
index d6be12a9ddd00..342537904b6ed 100644
--- a/sys/kern/subr_diskmbr.c
+++ b/sys/kern/subr_diskmbr.c
@@ -35,7 +35,7 @@
  *
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- *	$Id: diskslice_machdep.c,v 1.35 1999/06/26 02:47:09 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c
index d72940ec0b302..4d154c91300e7 100644
--- a/sys/kern/subr_diskslice.c
+++ b/sys/kern/subr_diskslice.c
@@ -43,7 +43,7 @@
  *	from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- *	$Id: subr_diskslice.c,v 1.66 1999/08/14 11:40:43 phk Exp $
+ * $FreeBSD$
  */
 
 #include "opt_devfs.h"
diff --git a/sys/kern/subr_dkbad.c b/sys/kern/subr_dkbad.c
index 13cf4e5dc1e29..d09541814fec5 100644
--- a/sys/kern/subr_dkbad.c
+++ b/sys/kern/subr_dkbad.c
@@ -43,7 +43,7 @@
  *	from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- *	$Id: subr_dkbad.c,v 1.10 1999/06/26 02:46:03 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_eventhandler.c b/sys/kern/subr_eventhandler.c
index 2caef177298d3..997afa7a5a92d 100644
--- a/sys/kern/subr_eventhandler.c
+++ b/sys/kern/subr_eventhandler.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c
index 7272789fc8f57..b08a3f8705a0f 100644
--- a/sys/kern/subr_log.c
+++ b/sys/kern/subr_log.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_log.c	8.1 (Berkeley) 6/10/93
- * $Id: subr_log.c,v 1.36 1999/05/31 11:27:35 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/subr_module.c b/sys/kern/subr_module.c
index 7eb635a13bde8..15df73bbf1e11 100644
--- a/sys/kern/subr_module.c
+++ b/sys/kern/subr_module.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: subr_module.c,v 1.3 1998/10/12 09:03:48 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c
index b9a906281f182..9a0a85f08a0ab 100644
--- a/sys/kern/subr_param.c
+++ b/sys/kern/subr_param.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.c	8.3 (Berkeley) 8/20/94
- * $Id: param.c,v 1.33 1999/04/09 16:28:11 des Exp $
+ * $FreeBSD$
  */
 
 #include <stddef.h>
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index 932b6e5fd1b74..e8d523e393d86 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_prf.c	8.3 (Berkeley) 1/21/94
- * $Id: subr_prf.c,v 1.59 1999/08/07 20:13:32 green Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c
index bed6aa038ce46..ed9c0d8b77e3c 100644
--- a/sys/kern/subr_prof.c
+++ b/sys/kern/subr_prof.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_prof.c	8.3 (Berkeley) 9/23/93
- * $Id: subr_prof.c,v 1.28 1998/09/05 14:30:11 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_rman.c b/sys/kern/subr_rman.c
index 609937eddf32c..ed9a633ab7613 100644
--- a/sys/kern/subr_rman.c
+++ b/sys/kern/subr_rman.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: subr_rman.c,v 1.7 1999/04/16 21:22:39 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/subr_scanf.c b/sys/kern/subr_scanf.c
index 8b1f7404c26d1..ea3c03df67434 100644
--- a/sys/kern/subr_scanf.c
+++ b/sys/kern/subr_scanf.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: subr_scanf.c,v 1.5 1999/02/14 20:58:21 dillon Exp $
+ * $FreeBSD$
  * From: Id: vfscanf.c,v 1.13 1998/09/25 12:20:27 obrien Exp 
  */
 
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c
index 969cd0892495d..283ed1701a3cc 100644
--- a/sys/kern/subr_smp.c
+++ b/sys/kern/subr_smp.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.106 1999/07/20 06:52:26 msmith Exp $
+ * $FreeBSD$
  */
 
 #include "opt_smp.h"
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index e717563e7ed57..5e3ed49ee48af 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.139 1999/06/18 14:32:16 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/subr_xxx.c b/sys/kern/subr_xxx.c
index 5339179923e92..e0298f71702cf 100644
--- a/sys/kern/subr_xxx.c
+++ b/sys/kern/subr_xxx.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_xxx.c	8.1 (Berkeley) 6/10/93
- * $Id: subr_xxx.c,v 1.12 1998/11/08 12:39:02 dfr Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 2a81043553985..e187c21dea20e 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sys_generic.c	8.5 (Berkeley) 1/21/94
- * $Id: sys_generic.c,v 1.46 1999/03/27 21:16:33 alc Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ktrace.h"
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index 06b897f69a914..e4f6d506d9e43 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -16,7 +16,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id: sys_pipe.c,v 1.52 1999/06/05 03:53:57 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index 814db9845c5e3..8a40fb4eb339a 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sys_process.c,v 1.46 1999/07/01 22:52:40 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c
index 123ff936aaf93..6ad438328dc6d 100644
--- a/sys/kern/sys_socket.c
+++ b/sys/kern/sys_socket.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sys_socket.c	8.1 (Berkeley) 6/10/93
- * $Id: sys_socket.c,v 1.24 1999/04/04 21:41:16 dt Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index dc2ca3c25b96e..843cc9d135b69 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
-	$Id: syscalls.master,v 1.61 1999/08/05 08:18:45 jkh Exp $
+ $FreeBSD$
 ;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
 ;
 ; System call name/number master file.
diff --git a/sys/kern/sysv_ipc.c b/sys/kern/sysv_ipc.c
index 116ae31ec4054..4a006add5be3a 100644
--- a/sys/kern/sysv_ipc.c
+++ b/sys/kern/sysv_ipc.c
@@ -1,4 +1,4 @@
-/*	$Id: sysv_ipc.c,v 1.10 1999/04/27 11:16:15 phk Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: sysv_ipc.c,v 1.7 1994/06/29 06:33:11 cgd Exp $	*/
 
 /*
diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c
index 4d0e3e7b74611..badbdc498c0fc 100644
--- a/sys/kern/sysv_msg.c
+++ b/sys/kern/sysv_msg.c
@@ -1,4 +1,4 @@
-/*	$Id: sysv_msg.c,v 1.21 1999/04/27 11:16:16 phk Exp $ */
+/* $FreeBSD$ */
 
 /*
  * Implementation of SVID messages
diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c
index 8a27aa936379c..534f75431bb95 100644
--- a/sys/kern/sysv_sem.c
+++ b/sys/kern/sysv_sem.c
@@ -1,4 +1,4 @@
-/*	$Id: sysv_sem.c,v 1.22 1998/12/14 08:34:55 dillon Exp $ */
+/* $FreeBSD$ */
 
 /*
  * Implementation of SVID semaphores
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index 637188786fd69..533502cc5c0a0 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -1,4 +1,4 @@
-/*	$Id: sysv_shm.c,v 1.41 1999/04/27 12:21:09 phk Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: sysv_shm.c,v 1.23 1994/07/04 23:25:12 glass Exp $	*/
 
 /*
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index fca46ba786019..ee1b6e76577c5 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty.c	8.8 (Berkeley) 1/21/94
- * $Id: tty.c,v 1.120 1999/08/08 19:47:31 phk Exp $
+ * $FreeBSD$
  */
 
 /*-
diff --git a/sys/kern/tty_compat.c b/sys/kern/tty_compat.c
index fa2ae5c002ff6..c104e223c1063 100644
--- a/sys/kern/tty_compat.c
+++ b/sys/kern/tty_compat.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_compat.c	8.1 (Berkeley) 6/10/93
- * $Id: tty_compat.c,v 1.27 1998/02/25 06:16:37 bde Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/tty_conf.c b/sys/kern/tty_conf.c
index 12f26e0f8f524..43c73be8ac7ee 100644
--- a/sys/kern/tty_conf.c
+++ b/sys/kern/tty_conf.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_conf.c	8.4 (Berkeley) 1/21/94
- * $Id: tty_conf.c,v 1.12 1997/12/16 17:40:27 eivind Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c
index 397b56b7941a9..4fef6f65cc32e 100644
--- a/sys/kern/tty_cons.c
+++ b/sys/kern/tty_cons.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
- *	$Id: tty_cons.c,v 1.73 1999/08/13 10:52:22 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index 47b7df93f24a6..a29687c84dddd 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_pty.c	8.4 (Berkeley) 2/20/95
- * $Id: tty_pty.c,v 1.65 1999/08/20 20:25:00 julian Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/tty_snoop.c b/sys/kern/tty_snoop.c
index 0e7bf1afd7a8a..7563686558842 100644
--- a/sys/kern/tty_snoop.c
+++ b/sys/kern/tty_snoop.c
@@ -12,7 +12,7 @@
  *
  * Snoop stuff.
  *
- *	$Id: tty_snoop.c,v 1.40 1999/06/17 23:42:44 gpalmer Exp $
+ * $FreeBSD$
  */
 
 #include "snp.h"
diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c
index b1e5edaa5c37d..a7d1daf79e8e6 100644
--- a/sys/kern/tty_subr.c
+++ b/sys/kern/tty_subr.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: tty_subr.c,v 1.30 1998/07/15 02:32:12 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/tty_tb.c b/sys/kern/tty_tb.c
index 8f4c84c66383c..39b75c2bf387a 100644
--- a/sys/kern/tty_tb.c
+++ b/sys/kern/tty_tb.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_tb.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #include "tb.h"
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index 1109c07382f08..1ee95bcaaa901 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_tty.c	8.2 (Berkeley) 9/23/93
- * $Id: tty_tty.c,v 1.27 1999/05/31 11:27:41 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c
index cb6f6efdb7486..d4aa88fa8ca75 100644
--- a/sys/kern/uipc_domain.c
+++ b/sys/kern/uipc_domain.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_domain.c	8.2 (Berkeley) 10/18/93
- *	$Id: uipc_domain.c,v 1.20 1999/01/21 00:26:41 julian Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 92505fb6b8ab1..fdf341dc6cc27 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_mbuf.c	8.2 (Berkeley) 1/4/94
- *	$Id: uipc_mbuf.c,v 1.40 1999/07/01 13:21:39 peter Exp $
+ * $FreeBSD$
  */
 
 #include "opt_param.h"
diff --git a/sys/kern/uipc_proto.c b/sys/kern/uipc_proto.c
index 7d6e3b64bd5bb..d114feef1a410 100644
--- a/sys/kern/uipc_proto.c
+++ b/sys/kern/uipc_proto.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_proto.c	8.1 (Berkeley) 6/10/93
- * $Id: uipc_proto.c,v 1.18 1999/02/16 10:49:49 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c
index 14d73c32741e0..f6115a97186e5 100644
--- a/sys/kern/uipc_sockbuf.c
+++ b/sys/kern/uipc_sockbuf.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_socket2.c	8.1 (Berkeley) 6/10/93
- *	$Id: uipc_socket2.c,v 1.47 1999/06/17 23:54:48 green Exp $
+ * $FreeBSD$
  */
 
 #include "opt_param.h"
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 3bda374aba2ed..0cf3c048d7934 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_socket.c	8.3 (Berkeley) 4/15/94
- *	$Id: uipc_socket.c,v 1.59 1999/06/04 02:27:02 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c
index 14d73c32741e0..f6115a97186e5 100644
--- a/sys/kern/uipc_socket2.c
+++ b/sys/kern/uipc_socket2.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_socket2.c	8.1 (Berkeley) 6/10/93
- *	$Id: uipc_socket2.c,v 1.47 1999/06/17 23:54:48 green Exp $
+ * $FreeBSD$
  */
 
 #include "opt_param.h"
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 5cf6100c53da0..05fb328ac9b18 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_syscalls.c	8.4 (Berkeley) 2/21/94
- * $Id: uipc_syscalls.c,v 1.55 1999/01/27 21:49:57 dillon Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 0d749bc06d836..d1c2613688856 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)uipc_usrreq.c	8.3 (Berkeley) 1/4/94
- *	$Id: uipc_usrreq.c,v 1.44 1999/05/10 18:09:39 truckman Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index 7d5fd4fa2f0dd..7caf954a1ca3d 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -13,7 +13,7 @@
  * bad that happens because of using this software isn't the responsibility
  * of the author.  This software is distributed AS-IS.
  *
- * $Id: vfs_aio.c,v 1.56 1999/08/13 10:10:01 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index f23db16e163cb..6b037752d8c7b 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -11,7 +11,7 @@
  * 2. Absolutely no warranty of function or purpose is made by the author
  *		John S. Dyson.
  *
- * $Id: vfs_bio.c,v 1.225 1999/08/08 18:42:48 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index ac6082f26267e..7c7afa3bd0fa6 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_cache.c	8.5 (Berkeley) 3/22/95
- * $Id: vfs_cache.c,v 1.38 1998/09/09 07:41:41 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index f6fc890b3dca3..f498b189fc2bd 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_cluster.c	8.7 (Berkeley) 2/13/94
- * $Id: vfs_cluster.c,v 1.86 1999/07/04 00:31:17 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include "opt_debug_cluster.h"
diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c
index c2c53f73aa7bf..87f3e4a7bc935 100644
--- a/sys/kern/vfs_conf.c
+++ b/sys/kern/vfs_conf.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_conf.c	8.8 (Berkeley) 3/31/94
- * $Id: vfs_conf.c,v 1.30 1999/07/03 08:24:00 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c
index 140f2d01f2184..f10fcf590d86d 100644
--- a/sys/kern/vfs_default.c
+++ b/sys/kern/vfs_default.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index dc2502dba2b69..c677e19c3aa01 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.220 1999/08/25 12:24:34 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index 6b6a687112aeb..ae7aeeb4ad7ff 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.132 1999/08/22 16:50:30 jdp Exp $
+ * $FreeBSD$
  */
 
 /* For 4.3 integer FS ID compatibility */
diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c
index 8ea1226d1e0ee..afe642c89cfd6 100644
--- a/sys/kern/vfs_init.c
+++ b/sys/kern/vfs_init.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_init.c	8.3 (Berkeley) 1/4/94
- * $Id: vfs_init.c,v 1.45 1999/03/07 16:06:41 dfr Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index 7d31e499f3b06..e168ce58c18de 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_lookup.c	8.4 (Berkeley) 2/16/94
- * $Id: vfs_lookup.c,v 1.33 1999/01/28 00:57:47 dillon Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ktrace.h"
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index c2c53f73aa7bf..87f3e4a7bc935 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_conf.c	8.8 (Berkeley) 3/31/94
- * $Id: vfs_conf.c,v 1.30 1999/07/03 08:24:00 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index dc2502dba2b69..c677e19c3aa01 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.220 1999/08/25 12:24:34 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 6b6a687112aeb..ae7aeeb4ad7ff 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.132 1999/08/22 16:50:30 jdp Exp $
+ * $FreeBSD$
  */
 
 /* For 4.3 integer FS ID compatibility */
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index a91ca18672f87..0a08938ae24ba 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_vnops.c	8.2 (Berkeley) 1/21/94
- * $Id: vfs_vnops.c,v 1.75 1999/08/25 11:44:11 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/kern/vnode_if.pl b/sys/kern/vnode_if.pl
index 07e0e91781c5c..9c042dbac7d8b 100644
--- a/sys/kern/vnode_if.pl
+++ b/sys/kern/vnode_if.pl
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)vnode_if.sh	8.1 (Berkeley) 6/10/93
-# $Id: vnode_if.sh,v 1.17 1999/02/28 11:30:00 bde Exp $
+# $FreeBSD$
 #
 
 # Script to produce VFS front-end sugar.
diff --git a/sys/kern/vnode_if.sh b/sys/kern/vnode_if.sh
index 07e0e91781c5c..9c042dbac7d8b 100644
--- a/sys/kern/vnode_if.sh
+++ b/sys/kern/vnode_if.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)vnode_if.sh	8.1 (Berkeley) 6/10/93
-# $Id: vnode_if.sh,v 1.17 1999/02/28 11:30:00 bde Exp $
+# $FreeBSD$
 #
 
 # Script to produce VFS front-end sugar.
diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src
index b60ff4a8492d6..bac48ddfdeea7 100644
--- a/sys/kern/vnode_if.src
+++ b/sys/kern/vnode_if.src
@@ -31,7 +31,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)vnode_if.src	8.12 (Berkeley) 5/14/95
-# $Id: vnode_if.src,v 1.20 1999/03/27 03:08:07 eivind Exp $
+# $FreeBSD$
 #
 
 #
diff --git a/sys/libkern/adddi3.c b/sys/libkern/adddi3.c
index 38b9df95e66b7..51793da73f708 100644
--- a/sys/libkern/adddi3.c
+++ b/sys/libkern/adddi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include "quad.h"
diff --git a/sys/libkern/anddi3.c b/sys/libkern/anddi3.c
index 9f92718ea6708..d278a3619463f 100644
--- a/sys/libkern/anddi3.c
+++ b/sys/libkern/anddi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include "quad.h"
diff --git a/sys/libkern/ashldi3.c b/sys/libkern/ashldi3.c
index 74fa0fdcdbced..4e8e8d6441b32 100644
--- a/sys/libkern/ashldi3.c
+++ b/sys/libkern/ashldi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include "quad.h"
diff --git a/sys/libkern/ashrdi3.c b/sys/libkern/ashrdi3.c
index 7d22f9d77371f..031fcc0523b4a 100644
--- a/sys/libkern/ashrdi3.c
+++ b/sys/libkern/ashrdi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include "quad.h"
diff --git a/sys/libkern/bcmp.c b/sys/libkern/bcmp.c
index cf0e525e0f685..7c09ce539414d 100644
--- a/sys/libkern/bcmp.c
+++ b/sys/libkern/bcmp.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: bcmp.c,v 1.4 1997/02/22 09:39:51 peter Exp $
+ * $FreeBSD$
  */
 
 #include <string.h>
diff --git a/sys/libkern/cmpdi2.c b/sys/libkern/cmpdi2.c
index d9c486bfe0444..55198b90d89f9 100644
--- a/sys/libkern/cmpdi2.c
+++ b/sys/libkern/cmpdi2.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: cmpdi2.c,v 1.4 1997/02/22 09:39:52 peter Exp $
+ * $FreeBSD$
  */
 
 #include <libkern/quad.h>
diff --git a/sys/libkern/divdi3.c b/sys/libkern/divdi3.c
index 73a21b3256cd0..b221ce58240c6 100644
--- a/sys/libkern/divdi3.c
+++ b/sys/libkern/divdi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <libkern/quad.h>
diff --git a/sys/libkern/ffs.c b/sys/libkern/ffs.c
index 74e24502caeee..533b8ec483a34 100644
--- a/sys/libkern/ffs.c
+++ b/sys/libkern/ffs.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <string.h>
diff --git a/sys/libkern/index.c b/sys/libkern/index.c
index c9483e7123b24..63512232fa2fc 100644
--- a/sys/libkern/index.c
+++ b/sys/libkern/index.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <string.h>
diff --git a/sys/libkern/iordi3.c b/sys/libkern/iordi3.c
index 2819cf8e5a0ae..8477ac24ea8b4 100644
--- a/sys/libkern/iordi3.c
+++ b/sys/libkern/iordi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include "quad.h"
diff --git a/sys/libkern/locc.c b/sys/libkern/locc.c
index 9c9b9213a86ba..a4510cad9c565 100644
--- a/sys/libkern/locc.c
+++ b/sys/libkern/locc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)locc.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/libkern.h>
diff --git a/sys/libkern/lshldi3.c b/sys/libkern/lshldi3.c
index 0aba85e008137..5d20c1d233cf1 100644
--- a/sys/libkern/lshldi3.c
+++ b/sys/libkern/lshldi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include "quad.h"
diff --git a/sys/libkern/lshrdi3.c b/sys/libkern/lshrdi3.c
index b93de210cec7e..6cce84eb658d7 100644
--- a/sys/libkern/lshrdi3.c
+++ b/sys/libkern/lshrdi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include "quad.h"
diff --git a/sys/libkern/mcount.c b/sys/libkern/mcount.c
index 7eaf3825e57c0..ca3c1c4c1209a 100644
--- a/sys/libkern/mcount.c
+++ b/sys/libkern/mcount.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/libkern/moddi3.c b/sys/libkern/moddi3.c
index d914dc17be64a..c0e51b32fb7ab 100644
--- a/sys/libkern/moddi3.c
+++ b/sys/libkern/moddi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: moddi3.c,v 1.5 1997/02/22 09:39:56 peter Exp $
+ * $FreeBSD$
  */
 
 #include <libkern/quad.h>
diff --git a/sys/libkern/muldi3.c b/sys/libkern/muldi3.c
index 82515630e8a1c..f17a2474dbdbd 100644
--- a/sys/libkern/muldi3.c
+++ b/sys/libkern/muldi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include "quad.h"
diff --git a/sys/libkern/negdi2.c b/sys/libkern/negdi2.c
index c4065e218d036..a803bf40e8f71 100644
--- a/sys/libkern/negdi2.c
+++ b/sys/libkern/negdi2.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include "quad.h"
diff --git a/sys/libkern/notdi2.c b/sys/libkern/notdi2.c
index f451088c35001..0a1e97e9e4eb3 100644
--- a/sys/libkern/notdi2.c
+++ b/sys/libkern/notdi2.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include "quad.h"
diff --git a/sys/libkern/qdivrem.c b/sys/libkern/qdivrem.c
index 82a363581a1d5..241adeb7a6cbd 100644
--- a/sys/libkern/qdivrem.c
+++ b/sys/libkern/qdivrem.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: qdivrem.c,v 1.6 1997/02/22 09:39:57 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/libkern/qsort.c b/sys/libkern/qsort.c
index 42f5932598a62..407ad6b0e67e0 100644
--- a/sys/libkern/qsort.c
+++ b/sys/libkern/qsort.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: qsort.c,v 1.8 1998/04/15 17:46:34 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/libkern.h>
diff --git a/sys/libkern/quad.h b/sys/libkern/quad.h
index 0c9c9dd044cb0..14f57542f7617 100644
--- a/sys/libkern/quad.h
+++ b/sys/libkern/quad.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)quad.h	8.1 (Berkeley) 6/4/93
- *	$Id: quad.h,v 1.7 1999/05/14 05:05:32 gibbs Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/libkern/random.c b/sys/libkern/random.c
index 97b4c8e4273be..35ddea1add681 100644
--- a/sys/libkern/random.c
+++ b/sys/libkern/random.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)random.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/libkern.h>
diff --git a/sys/libkern/rindex.c b/sys/libkern/rindex.c
index bd661fbeb0653..f51abccb84d48 100644
--- a/sys/libkern/rindex.c
+++ b/sys/libkern/rindex.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <stddef.h>
diff --git a/sys/libkern/scanc.c b/sys/libkern/scanc.c
index 0233e2c81d62c..2a68f583f0144 100644
--- a/sys/libkern/scanc.c
+++ b/sys/libkern/scanc.c
@@ -32,7 +32,7 @@
  *
  *	@(#)scanc.c	8.1 (Berkeley) 6/10/93
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/libkern.h>
diff --git a/sys/libkern/skpc.c b/sys/libkern/skpc.c
index 9348b0e3ece6b..8ea07da266a7e 100644
--- a/sys/libkern/skpc.c
+++ b/sys/libkern/skpc.c
@@ -32,7 +32,7 @@
  *
  *	@(#)skpc.c	8.1 (Berkeley) 6/10/93
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/libkern.h>
diff --git a/sys/libkern/strcat.c b/sys/libkern/strcat.c
index 707cb145c3553..2d9da767828f7 100644
--- a/sys/libkern/strcat.c
+++ b/sys/libkern/strcat.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: strcat.c,v 1.4 1997/02/22 09:40:02 peter Exp $
+ * $FreeBSD$
  */
 
 #include <string.h>
diff --git a/sys/libkern/strcmp.c b/sys/libkern/strcmp.c
index 494e21f10848a..77c5f66233e92 100644
--- a/sys/libkern/strcmp.c
+++ b/sys/libkern/strcmp.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: strcmp.c,v 1.5 1997/02/22 09:40:02 peter Exp $
+ * $FreeBSD$
  */
 
 #include <string.h>
diff --git a/sys/libkern/strcpy.c b/sys/libkern/strcpy.c
index 93de5b9914e13..cf6bd4ff029bd 100644
--- a/sys/libkern/strcpy.c
+++ b/sys/libkern/strcpy.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: strcpy.c,v 1.5 1997/08/02 14:31:50 bde Exp $
+ * $FreeBSD$
  */
 
 #include <string.h>
diff --git a/sys/libkern/strlen.c b/sys/libkern/strlen.c
index 52e0da1bed177..e3e50cbfca29e 100644
--- a/sys/libkern/strlen.c
+++ b/sys/libkern/strlen.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: strlen.c,v 1.4 1997/02/22 09:40:03 peter Exp $
+ * $FreeBSD$
  */
 
 #include <string.h>
diff --git a/sys/libkern/strncmp.c b/sys/libkern/strncmp.c
index d089d8920a9ef..523a456fe4ef0 100644
--- a/sys/libkern/strncmp.c
+++ b/sys/libkern/strncmp.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: strncmp.c,v 1.5 1997/02/22 09:40:03 peter Exp $
+ * $FreeBSD$
  */
 
 #include <string.h>
diff --git a/sys/libkern/strncpy.c b/sys/libkern/strncpy.c
index 44ebc0ed4e10a..2b36d1a194597 100644
--- a/sys/libkern/strncpy.c
+++ b/sys/libkern/strncpy.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: strncpy.c,v 1.4 1997/02/22 09:40:04 peter Exp $
+ * $FreeBSD$
  */
 
 #include <string.h>
diff --git a/sys/libkern/subdi3.c b/sys/libkern/subdi3.c
index cb54477a4d45c..9f34e6b4e370c 100644
--- a/sys/libkern/subdi3.c
+++ b/sys/libkern/subdi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include "quad.h"
diff --git a/sys/libkern/ucmpdi2.c b/sys/libkern/ucmpdi2.c
index 2d23081f65592..5cce1827ed306 100644
--- a/sys/libkern/ucmpdi2.c
+++ b/sys/libkern/ucmpdi2.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ucmpdi2.c,v 1.6 1999/05/14 17:39:54 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include <libkern/quad.h>
diff --git a/sys/libkern/udivdi3.c b/sys/libkern/udivdi3.c
index 153c715c693f5..0827fbdc826c2 100644
--- a/sys/libkern/udivdi3.c
+++ b/sys/libkern/udivdi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <libkern/quad.h>
diff --git a/sys/libkern/umoddi3.c b/sys/libkern/umoddi3.c
index b076b0e232ae2..30fb30713f3ae 100644
--- a/sys/libkern/umoddi3.c
+++ b/sys/libkern/umoddi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <libkern/quad.h>
diff --git a/sys/libkern/xordi3.c b/sys/libkern/xordi3.c
index e49190902a22b..b666446f049e4 100644
--- a/sys/libkern/xordi3.c
+++ b/sys/libkern/xordi3.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include "quad.h"
diff --git a/sys/miscfs/deadfs/dead_vnops.c b/sys/miscfs/deadfs/dead_vnops.c
index 4e3853ce54c50..f9acbd0435875 100644
--- a/sys/miscfs/deadfs/dead_vnops.c
+++ b/sys/miscfs/deadfs/dead_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dead_vnops.c	8.1 (Berkeley) 6/10/93
- * $Id: dead_vnops.c,v 1.24 1998/08/23 11:43:29 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/devfs/devfs_tree.c b/sys/miscfs/devfs/devfs_tree.c
index c7bfb5680c3d2..0c8e434ce6ac7 100644
--- a/sys/miscfs/devfs/devfs_tree.c
+++ b/sys/miscfs/devfs/devfs_tree.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- *	$Id: devfs_tree.c,v 1.62 1999/08/25 22:50:11 julian Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/miscfs/devfs/devfs_vfsops.c b/sys/miscfs/devfs/devfs_vfsops.c
index f3611f18d5a86..dbc2f31a37bed 100644
--- a/sys/miscfs/devfs/devfs_vfsops.c
+++ b/sys/miscfs/devfs/devfs_vfsops.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- *	$Id: devfs_vfsops.c,v 1.35 1998/12/07 21:58:30 archie Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/miscfs/devfs/devfs_vnops.c b/sys/miscfs/devfs/devfs_vnops.c
index 5506961ce8412..9d6ce1339979e 100644
--- a/sys/miscfs/devfs/devfs_vnops.c
+++ b/sys/miscfs/devfs/devfs_vnops.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- *	$Id: devfs_vnops.c,v 1.78 1999/08/25 02:04:40 julian Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/miscfs/devfs/devfsdefs.h b/sys/miscfs/devfs/devfsdefs.h
index ece7f7e3bfcb6..7df378ccade8d 100644
--- a/sys/miscfs/devfs/devfsdefs.h
+++ b/sys/miscfs/devfs/devfsdefs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $Id: devfsdefs.h,v 1.18 1998/11/09 07:03:04 peter Exp $
+ * $FreeBSD$
  */
 #ifdef DEVFS_DEBUG
 #define DBPRINT(A) printf(A)
diff --git a/sys/miscfs/fdesc/fdesc.h b/sys/miscfs/fdesc/fdesc.h
index bbba54dcfdd80..463e52836918b 100644
--- a/sys/miscfs/fdesc/fdesc.h
+++ b/sys/miscfs/fdesc/fdesc.h
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc.h	8.5 (Berkeley) 1/21/94
  *
- * $Id: fdesc.h,v 1.5 1997/02/22 09:40:14 peter Exp $
+ * $FreeBSD$
  */
 
 #ifdef KERNEL
diff --git a/sys/miscfs/fdesc/fdesc_vfsops.c b/sys/miscfs/fdesc/fdesc_vfsops.c
index 758f3b5abbe63..157454c502ef5 100644
--- a/sys/miscfs/fdesc/fdesc_vfsops.c
+++ b/sys/miscfs/fdesc/fdesc_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc_vfsops.c	8.4 (Berkeley) 1/21/94
  *
- * $Id: fdesc_vfsops.c,v 1.17 1999/01/12 11:49:30 eivind Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c
index bc0cb5b48b7de..17a38d5be9d61 100644
--- a/sys/miscfs/fdesc/fdesc_vnops.c
+++ b/sys/miscfs/fdesc/fdesc_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc_vnops.c	8.9 (Berkeley) 1/21/94
  *
- * $Id: fdesc_vnops.c,v 1.42 1999/05/31 11:27:49 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/fifofs/fifo.h b/sys/miscfs/fifofs/fifo.h
index ec186d0daccba..e630207528638 100644
--- a/sys/miscfs/fifofs/fifo.h
+++ b/sys/miscfs/fifofs/fifo.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo.h	8.6 (Berkeley) 5/21/95
- * $Id: fifo.h,v 1.14 1997/09/14 02:57:51 peter Exp $
+ * $FreeBSD$
  */
 
 extern vop_t **fifo_vnodeop_p;
diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c
index f7e47e1284fbc..4a8199a672b5c 100644
--- a/sys/miscfs/fifofs/fifo_vnops.c
+++ b/sys/miscfs/fifofs/fifo_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.10 (Berkeley) 5/27/95
- * $Id: fifo_vnops.c,v 1.42 1998/02/04 22:32:45 eivind Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/kernfs/kernfs.h b/sys/miscfs/kernfs/kernfs.h
index 47a80cfc9afd0..361d4899bead6 100644
--- a/sys/miscfs/kernfs/kernfs.h
+++ b/sys/miscfs/kernfs/kernfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernfs.h	8.6 (Berkeley) 3/29/95
- * $Id: kernfs.h,v 1.9 1998/03/01 22:46:12 msmith Exp $
+ * $FreeBSD$
  */
 
 #define	_PATH_KERNFS	"/kern"		/* Default mountpoint */
diff --git a/sys/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c
index 295b647dea174..522f77d008779 100644
--- a/sys/miscfs/kernfs/kernfs_vfsops.c
+++ b/sys/miscfs/kernfs/kernfs_vfsops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernfs_vfsops.c	8.10 (Berkeley) 5/14/95
- * $Id: kernfs_vfsops.c,v 1.29 1999/08/13 10:29:22 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/kernfs/kernfs_vnops.c b/sys/miscfs/kernfs/kernfs_vnops.c
index cf5b8d7bf6481..0488709374dd8 100644
--- a/sys/miscfs/kernfs/kernfs_vnops.c
+++ b/sys/miscfs/kernfs/kernfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernfs_vnops.c	8.15 (Berkeley) 5/21/95
- * $Id: kernfs_vnops.c,v 1.38 1999/01/27 22:42:06 dillon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/nullfs/null.h b/sys/miscfs/nullfs/null.h
index 7d46a11cd4ac7..f796d18c67063 100644
--- a/sys/miscfs/nullfs/null.h
+++ b/sys/miscfs/nullfs/null.h
@@ -35,7 +35,7 @@
  *
  *	@(#)null.h	8.3 (Berkeley) 8/20/94
  *
- * $Id: null.h,v 1.7 1997/05/25 04:50:02 peter Exp $
+ * $FreeBSD$
  */
 
 struct null_args {
diff --git a/sys/miscfs/nullfs/null_subr.c b/sys/miscfs/nullfs/null_subr.c
index 603f418fb1c31..1504fc84ac0eb 100644
--- a/sys/miscfs/nullfs/null_subr.c
+++ b/sys/miscfs/nullfs/null_subr.c
@@ -35,7 +35,7 @@
  *
  *	@(#)null_subr.c	8.7 (Berkeley) 5/14/95
  *
- * $Id: null_subr.c,v 1.18 1998/07/15 02:32:18 bde Exp $
+ * $FreeBSD$
  */
 
 #include "opt_debug_nullfs.h"
diff --git a/sys/miscfs/nullfs/null_vfsops.c b/sys/miscfs/nullfs/null_vfsops.c
index 4ead5bd50c9fd..f6ac5a0f749a6 100644
--- a/sys/miscfs/nullfs/null_vfsops.c
+++ b/sys/miscfs/nullfs/null_vfsops.c
@@ -36,7 +36,7 @@
  *	@(#)null_vfsops.c	8.2 (Berkeley) 1/21/94
  *
  * @(#)lofs_vfsops.c	1.2 (Berkeley) 6/18/92
- * $Id: null_vfsops.c,v 1.27 1998/07/30 17:40:45 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/nullfs/null_vnops.c b/sys/miscfs/nullfs/null_vnops.c
index 638b9edfa69fc..c9019210da55e 100644
--- a/sys/miscfs/nullfs/null_vnops.c
+++ b/sys/miscfs/nullfs/null_vnops.c
@@ -37,11 +37,11 @@
  *
  * Ancestors:
  *	@(#)lofs_vnops.c	1.2 (Berkeley) 6/18/92
- *	$Id: null_vnops.c,v 1.33 1999/06/16 23:27:38 mckusick Exp $
+ * $FreeBSD$
  *	...and...
  *	@(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
  *
- * $Id: null_vnops.c,v 1.33 1999/06/16 23:27:38 mckusick Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/portal/portal.h b/sys/miscfs/portal/portal.h
index d60826e6a1697..6e781455d75b3 100644
--- a/sys/miscfs/portal/portal.h
+++ b/sys/miscfs/portal/portal.h
@@ -35,7 +35,7 @@
  *
  *	@(#)portal.h	8.4 (Berkeley) 1/21/94
  *
- * $Id: portal.h,v 1.4 1997/02/22 09:40:24 peter Exp $
+ * $FreeBSD$
  */
 
 struct portal_args {
diff --git a/sys/miscfs/portal/portal_vfsops.c b/sys/miscfs/portal/portal_vfsops.c
index 633bf776e10b4..d447664171f1c 100644
--- a/sys/miscfs/portal/portal_vfsops.c
+++ b/sys/miscfs/portal/portal_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vfsops.c	8.11 (Berkeley) 5/14/95
  *
- * $Id: portal_vfsops.c,v 1.21 1998/05/06 05:29:35 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/portal/portal_vnops.c b/sys/miscfs/portal/portal_vnops.c
index ad96332d45104..f158eadffd07b 100644
--- a/sys/miscfs/portal/portal_vnops.c
+++ b/sys/miscfs/portal/portal_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vnops.c	8.14 (Berkeley) 5/21/95
  *
- * $Id: portal_vnops.c,v 1.35 1999/01/12 11:49:30 eivind Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/procfs/README b/sys/miscfs/procfs/README
index 5f1b6cc7229be..f816b321b432c 100644
--- a/sys/miscfs/procfs/README
+++ b/sys/miscfs/procfs/README
@@ -110,4 +110,4 @@ the debugger, the debugger should fork and the child should stop itself
 "attach".  as before, the child will hit a breakpoint on the first
 instruction in any newly exec'd image.
 
-$Id$
+$FreeBSD$
diff --git a/sys/miscfs/procfs/procfs.h b/sys/miscfs/procfs/procfs.h
index f813070e699e5..07c6da215a585 100644
--- a/sys/miscfs/procfs/procfs.h
+++ b/sys/miscfs/procfs/procfs.h
@@ -37,7 +37,7 @@
  *	@(#)procfs.h	8.9 (Berkeley) 5/14/95
  *
  * From:
- *	$Id: procfs.h,v 1.26 1999/06/13 20:53:13 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/procfs/procfs_ctl.c b/sys/miscfs/procfs/procfs_ctl.c
index 21724e5c294c0..4f4d84bf02af6 100644
--- a/sys/miscfs/procfs/procfs_ctl.c
+++ b/sys/miscfs/procfs/procfs_ctl.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_ctl.c	8.4 (Berkeley) 6/15/94
  *
  * From:
- *	$Id: procfs_ctl.c,v 1.16 1997/04/27 21:32:21 alex Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_dbregs.c b/sys/miscfs/procfs/procfs_dbregs.c
index 02509e006d78d..ce990e9837455 100644
--- a/sys/miscfs/procfs/procfs_dbregs.c
+++ b/sys/miscfs/procfs/procfs_dbregs.c
@@ -40,7 +40,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_fpregs.c b/sys/miscfs/procfs/procfs_fpregs.c
index 14c3fd39c04e3..b3331e5a726e6 100644
--- a/sys/miscfs/procfs/procfs_fpregs.c
+++ b/sys/miscfs/procfs/procfs_fpregs.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_fpregs.c	8.2 (Berkeley) 6/15/94
  *
  * From:
- *	$Id: procfs_fpregs.c,v 1.7 1997/08/02 14:32:11 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_map.c b/sys/miscfs/procfs/procfs_map.c
index 47a0ce17c7e73..83d73ab320d3a 100644
--- a/sys/miscfs/procfs/procfs_map.c
+++ b/sys/miscfs/procfs/procfs_map.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_status.c	8.3 (Berkeley) 2/17/94
  *
- *	$Id: procfs_map.c,v 1.21 1999/02/07 21:48:21 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_mem.c b/sys/miscfs/procfs/procfs_mem.c
index 5fe9ef6794d91..35ee564e074b3 100644
--- a/sys/miscfs/procfs/procfs_mem.c
+++ b/sys/miscfs/procfs/procfs_mem.c
@@ -37,7 +37,7 @@
  *
  *	@(#)procfs_mem.c	8.5 (Berkeley) 6/15/94
  *
- *	$Id: procfs_mem.c,v 1.36 1999/04/27 11:16:37 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/procfs/procfs_note.c b/sys/miscfs/procfs/procfs_note.c
index 8bfde33b640ac..273010b329563 100644
--- a/sys/miscfs/procfs/procfs_note.c
+++ b/sys/miscfs/procfs/procfs_note.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_note.c	8.2 (Berkeley) 1/21/94
  *
- *	$Id: procfs_note.c,v 1.4 1997/02/22 09:40:28 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_regs.c b/sys/miscfs/procfs/procfs_regs.c
index d215d44a33cf4..0edb9ad606396 100644
--- a/sys/miscfs/procfs/procfs_regs.c
+++ b/sys/miscfs/procfs/procfs_regs.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_regs.c	8.4 (Berkeley) 6/15/94
  *
  * From:
- *	$Id: procfs_regs.c,v 1.7 1997/08/02 14:32:16 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_rlimit.c b/sys/miscfs/procfs/procfs_rlimit.c
index 07bcd1061936a..5f00aafd072e5 100644
--- a/sys/miscfs/procfs/procfs_rlimit.c
+++ b/sys/miscfs/procfs/procfs_rlimit.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_status.c	8.4 (Berkeley) 6/15/94
  *
- *	$Id: procfs_rlimit.c,v 1.2 1999/07/09 17:56:59 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/procfs/procfs_status.c b/sys/miscfs/procfs/procfs_status.c
index 2c8cb697ad63b..b3ebd1f1983cf 100644
--- a/sys/miscfs/procfs/procfs_status.c
+++ b/sys/miscfs/procfs/procfs_status.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_status.c	8.4 (Berkeley) 6/15/94
  *
  * From:
- *	$Id: procfs_status.c,v 1.14 1999/05/22 20:10:26 dt Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_subr.c b/sys/miscfs/procfs/procfs_subr.c
index cf313e8638564..01e8ae9e014aa 100644
--- a/sys/miscfs/procfs/procfs_subr.c
+++ b/sys/miscfs/procfs/procfs_subr.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_subr.c	8.6 (Berkeley) 5/14/95
  *
- *	$Id: procfs_subr.c,v 1.24 1999/04/30 13:04:21 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_type.c b/sys/miscfs/procfs/procfs_type.c
index 8f85c548b03f8..cb2a45f6a3d6a 100644
--- a/sys/miscfs/procfs/procfs_type.c
+++ b/sys/miscfs/procfs/procfs_type.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: procfs_type.c,v 1.4 1997/03/24 11:24:42 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/procfs/procfs_vfsops.c b/sys/miscfs/procfs/procfs_vfsops.c
index 2c22020e4fc0b..0478e386d51c4 100644
--- a/sys/miscfs/procfs/procfs_vfsops.c
+++ b/sys/miscfs/procfs/procfs_vfsops.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_vfsops.c	8.7 (Berkeley) 5/10/95
  *
- *	$Id: procfs_vfsops.c,v 1.26 1998/09/07 13:17:01 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c
index 9040c5bf4b41c..2eb893415eeae 100644
--- a/sys/miscfs/procfs/procfs_vnops.c
+++ b/sys/miscfs/procfs/procfs_vnops.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_vnops.c	8.18 (Berkeley) 5/21/95
  *
- *	$Id: procfs_vnops.c,v 1.70 1999/07/09 04:16:00 jlemon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index ca1835e5cd83a..1afc40017da4f 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spec_vnops.c	8.14 (Berkeley) 5/21/95
- * $Id: spec_vnops.c,v 1.98 1999/08/25 00:26:34 julian Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/umapfs/umap.h b/sys/miscfs/umapfs/umap.h
index 0c6ca3418245e..09963cbe2b655 100644
--- a/sys/miscfs/umapfs/umap.h
+++ b/sys/miscfs/umapfs/umap.h
@@ -35,7 +35,7 @@
  *
  *	@(#)umap.h	8.4 (Berkeley) 8/20/94
  *
- * $Id: umap.h,v 1.8 1997/02/22 09:40:37 peter Exp $
+ * $FreeBSD$
  */
 
 #define MAPFILEENTRIES 64
diff --git a/sys/miscfs/umapfs/umap_subr.c b/sys/miscfs/umapfs/umap_subr.c
index 4974f03c110c6..ed316a944cb12 100644
--- a/sys/miscfs/umapfs/umap_subr.c
+++ b/sys/miscfs/umapfs/umap_subr.c
@@ -35,7 +35,7 @@
  *
  *	@(#)umap_subr.c	8.9 (Berkeley) 5/14/95
  *
- * $Id: umap_subr.c,v 1.15 1998/11/09 09:21:25 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/umapfs/umap_vfsops.c b/sys/miscfs/umapfs/umap_vfsops.c
index 3acc700a64fc0..658a4ceee1826 100644
--- a/sys/miscfs/umapfs/umap_vfsops.c
+++ b/sys/miscfs/umapfs/umap_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)umap_vfsops.c	8.8 (Berkeley) 5/14/95
  *
- * $Id: umap_vfsops.c,v 1.24 1999/03/12 19:40:39 imp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/umapfs/umap_vnops.c b/sys/miscfs/umapfs/umap_vnops.c
index ae47731b92153..0b73ccbb39dcf 100644
--- a/sys/miscfs/umapfs/umap_vnops.c
+++ b/sys/miscfs/umapfs/umap_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)umap_vnops.c	8.6 (Berkeley) 5/22/95
- * $Id: umap_vnops.c,v 1.27 1999/06/16 23:27:41 mckusick Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/union/union.h b/sys/miscfs/union/union.h
index 6a4aa226203e2..1fc5f996cab09 100644
--- a/sys/miscfs/union/union.h
+++ b/sys/miscfs/union/union.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union.h	8.9 (Berkeley) 12/10/94
- * $Id: union.h,v 1.12 1998/02/26 03:23:51 kato Exp $
+ * $FreeBSD$
  */
 
 struct union_args {
diff --git a/sys/miscfs/union/union_subr.c b/sys/miscfs/union/union_subr.c
index 5ced12f6e322a..6334810ae622c 100644
--- a/sys/miscfs/union/union_subr.c
+++ b/sys/miscfs/union/union_subr.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_subr.c	8.20 (Berkeley) 5/20/95
- * $Id: union_subr.c,v 1.36 1998/12/14 05:00:59 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/miscfs/union/union_vfsops.c b/sys/miscfs/union/union_vfsops.c
index db4d4d3b14e8e..a02fb9a71f8ff 100644
--- a/sys/miscfs/union/union_vfsops.c
+++ b/sys/miscfs/union/union_vfsops.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vfsops.c	8.20 (Berkeley) 5/20/95
- * $Id: union_vfsops.c,v 1.30 1998/09/07 13:17:02 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c
index 25d2dfd2bf874..145f8ca6f0ad5 100644
--- a/sys/miscfs/union/union_vnops.c
+++ b/sys/miscfs/union/union_vnops.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vnops.c	8.32 (Berkeley) 6/23/95
- * $Id: union_vnops.c,v 1.61 1999/06/16 23:27:43 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index db7bdd1b66856..2f28cb759685e 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.72 1999/08/21 17:40:39 wpaul Exp $
+# $FreeBSD$
 
 # XXX present but broken: atapi ip_mroute_mod joy pcic
 
diff --git a/sys/modules/Makefile.inc b/sys/modules/Makefile.inc
index 5aa863d3f3b9c..2e4c96d251b48 100644
--- a/sys/modules/Makefile.inc
+++ b/sys/modules/Makefile.inc
@@ -1,3 +1,3 @@
-# $Id$
+# $FreeBSD$
 
 KLDMOD=	true
diff --git a/sys/modules/atapi/Makefile b/sys/modules/atapi/Makefile
index 22b5a7e23774e..a145312597c94 100644
--- a/sys/modules/atapi/Makefile
+++ b/sys/modules/atapi/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.11 1998/02/25 01:40:54 bde Exp $
+# $FreeBSD$
 
 .PATH:          ${.CURDIR}/../../i386/isa
 KMOD            = atapi
diff --git a/sys/modules/ax/Makefile b/sys/modules/ax/Makefile
index 0d320364369bf..49c977f91bff0 100644
--- a/sys/modules/ax/Makefile
+++ b/sys/modules/ax/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/07/24 20:55:04 wpaul Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
diff --git a/sys/modules/bktr/Makefile b/sys/modules/bktr/Makefile
index f74deb73799b4..cb17db2a800fd 100644
--- a/sys/modules/bktr/Makefile
+++ b/sys/modules/bktr/Makefile
@@ -9,7 +9,7 @@
 # Note - as the driver requires contiguous memory, loading the driver once
 # memory has filled or become fragmented may fail.
 
-#	$Id: Makefile,v 1.1 1999/06/12 15:00:19 roger Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:  $S/pci
diff --git a/sys/modules/ccd/Makefile b/sys/modules/ccd/Makefile
index 93cf3c10dee86..223ad52b8ef51 100644
--- a/sys/modules/ccd/Makefile
+++ b/sys/modules/ccd/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.6 1998/02/01 18:12:12 bde Exp $ 
+# $FreeBSD$ 
 
 .PATH:  ${.CURDIR}/../../dev/ccd
 KMOD=   ccd
diff --git a/sys/modules/cd9660/Makefile b/sys/modules/cd9660/Makefile
index 9c2dd4ba36d64..757725ac10e79 100644
--- a/sys/modules/cd9660/Makefile
+++ b/sys/modules/cd9660/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.5 1998/02/06 23:54:19 eivind Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../isofs/cd9660
 KMOD=	cd9660
diff --git a/sys/modules/coda/Makefile b/sys/modules/coda/Makefile
index f30ec7b464a24..d3ce37ebd1f04 100644
--- a/sys/modules/coda/Makefile
+++ b/sys/modules/coda/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1998/10/16 04:30:42 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../coda
 KMOD=	coda
diff --git a/sys/modules/coff/Makefile b/sys/modules/coff/Makefile
index 759158538e9af..ab7ecd123ad28 100644
--- a/sys/modules/coff/Makefile
+++ b/sys/modules/coff/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 1998/10/16 04:30:42 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../i386/ibcs2
 KMOD=	ibcs2_coff
diff --git a/sys/modules/fdesc/Makefile b/sys/modules/fdesc/Makefile
index 6052e62e063d2..4981b5636dac4 100644
--- a/sys/modules/fdesc/Makefile
+++ b/sys/modules/fdesc/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1997/02/22 12:47:49 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../miscfs/fdesc
 KMOD=	fdesc
diff --git a/sys/modules/fdescfs/Makefile b/sys/modules/fdescfs/Makefile
index 6052e62e063d2..4981b5636dac4 100644
--- a/sys/modules/fdescfs/Makefile
+++ b/sys/modules/fdescfs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1997/02/22 12:47:49 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../miscfs/fdesc
 KMOD=	fdesc
diff --git a/sys/modules/fpu/Makefile b/sys/modules/fpu/Makefile
index 680e3c78bcaea..66c2ad1ae02a5 100644
--- a/sys/modules/fpu/Makefile
+++ b/sys/modules/fpu/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.4 1997/07/20 08:46:27 bde Exp $
+# $FreeBSD$
 
 .PATH:  ${.CURDIR}/../../i386/i386
 KMOD=   fpu
diff --git a/sys/modules/fxp/Makefile b/sys/modules/fxp/Makefile
index 607f4597af6ff..d54f1532b8bdd 100644
--- a/sys/modules/fxp/Makefile
+++ b/sys/modules/fxp/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1999/04/18 13:31:23 dfr Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
diff --git a/sys/modules/gnufpu/Makefile b/sys/modules/gnufpu/Makefile
index 2332e4bc11b10..d7bfb676aa6f7 100644
--- a/sys/modules/gnufpu/Makefile
+++ b/sys/modules/gnufpu/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.5 1997/08/26 13:49:26 bde Exp $
+# $FreeBSD$
 
 .PATH:  ${.CURDIR}/../../gnu/i386/fpemul
 KMOD=   gnufpu
diff --git a/sys/modules/ibcs2/Makefile b/sys/modules/ibcs2/Makefile
index 9bb8a5b303bfe..f9e58255f0bd8 100644
--- a/sys/modules/ibcs2/Makefile
+++ b/sys/modules/ibcs2/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.22 1998/11/11 07:04:10 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../i386/ibcs2
 KMOD=	ibcs2
diff --git a/sys/modules/ibcs2/ibcs2.8 b/sys/modules/ibcs2/ibcs2.8
index 3d21cece9d012..be34bd88ba489 100644
--- a/sys/modules/ibcs2/ibcs2.8
+++ b/sys/modules/ibcs2/ibcs2.8
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: ibcs2.8,v 1.8 1999/04/06 13:57:33 ghelmer Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 27, 1995
 .Dt IBCS2 8
diff --git a/sys/modules/ibcs2/ibcs2.sh b/sys/modules/ibcs2/ibcs2.sh
index 0fd465fa023e1..c8bf2a809c810 100644
--- a/sys/modules/ibcs2/ibcs2.sh
+++ b/sys/modules/ibcs2/ibcs2.sh
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id: ibcs2,v 1.7 1997/02/22 12:47:59 peter Exp $
+# $FreeBSD$
 
 
 PATH=/bin:/sbin:/usr/bin:/usr/sbin; export PATH
diff --git a/sys/modules/if_disc/Makefile b/sys/modules/if_disc/Makefile
index 65fc09e7ef1b8..e5df9a67610ee 100644
--- a/sys/modules/if_disc/Makefile
+++ b/sys/modules/if_disc/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.7 1999/04/28 01:17:58 msmith Exp $
+# $FreeBSD$
 
 .PATH:  ${.CURDIR}/../../net
 KMOD=   if_disc
diff --git a/sys/modules/if_ppp/Makefile b/sys/modules/if_ppp/Makefile
index 14eaf4fd7e567..4f429dfab299e 100644
--- a/sys/modules/if_ppp/Makefile
+++ b/sys/modules/if_ppp/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.17 1999/04/28 01:18:02 msmith Exp $
+# $FreeBSD$
 
 .PATH:  ${.CURDIR}/../../net
 KMOD=   if_ppp
diff --git a/sys/modules/if_sl/Makefile b/sys/modules/if_sl/Makefile
index 96e3964f1ee8c..5d177c34b719b 100644
--- a/sys/modules/if_sl/Makefile
+++ b/sys/modules/if_sl/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.8 1999/04/28 01:18:05 msmith Exp $
+# $FreeBSD$
 
 .PATH:  ${.CURDIR}/../../net
 KMOD=   if_sl
diff --git a/sys/modules/if_tun/Makefile b/sys/modules/if_tun/Makefile
index 153a41e3939c9..038ef19a37dd2 100644
--- a/sys/modules/if_tun/Makefile
+++ b/sys/modules/if_tun/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.9 1999/04/28 01:18:08 msmith Exp $
+# $FreeBSD$
 
 .PATH:  ${.CURDIR}/../../net
 KMOD=   if_tun
diff --git a/sys/modules/ip_mroute_mod/Makefile b/sys/modules/ip_mroute_mod/Makefile
index f44df9fe03c89..39412bcd95a6a 100644
--- a/sys/modules/ip_mroute_mod/Makefile
+++ b/sys/modules/ip_mroute_mod/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1997/02/22 12:48:12 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../netinet
 KMOD=	ip_mroute
diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile
index a75c2124f5864..963349f865766 100644
--- a/sys/modules/ipfw/Makefile
+++ b/sys/modules/ipfw/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.9 1998/10/16 04:30:46 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../netinet
 KMOD=	ipfw
diff --git a/sys/modules/joy/Makefile b/sys/modules/joy/Makefile
index 335833f31b1dd..a54ef87c389f3 100644
--- a/sys/modules/joy/Makefile
+++ b/sys/modules/joy/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.10 1998/11/11 07:04:10 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../i386/isa
 KMOD	= joy
diff --git a/sys/modules/joy/joy.8 b/sys/modules/joy/joy.8
index b88217905eebc..e073e4731a474 100644
--- a/sys/modules/joy/joy.8
+++ b/sys/modules/joy/joy.8
@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: joy.8,v 1.5 1999/04/06 13:54:18 ghelmer Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 16, 1996
 .Dt JOY 8
diff --git a/sys/modules/joy/joy.sh b/sys/modules/joy/joy.sh
index 3f165a6aa2a16..48c5482eb12ba 100644
--- a/sys/modules/joy/joy.sh
+++ b/sys/modules/joy/joy.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
-# $Id: joy,v 1.3 1997/02/22 12:48:17 peter Exp $
+# $FreeBSD$
 
 kldload joy
diff --git a/sys/modules/kernfs/Makefile b/sys/modules/kernfs/Makefile
index d1c7500349aab..1b29c52442494 100644
--- a/sys/modules/kernfs/Makefile
+++ b/sys/modules/kernfs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1997/02/22 12:48:21 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../miscfs/kernfs
 KMOD=	kernfs
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index 72485f0be1b7d..0ac294c4c42e5 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.25 1999/01/26 21:29:01 julian Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../i386/linux
 KMOD=	linux
diff --git a/sys/modules/linux/linux.8 b/sys/modules/linux/linux.8
index df0d4973ad000..13f3f0b31f07a 100644
--- a/sys/modules/linux/linux.8
+++ b/sys/modules/linux/linux.8
@@ -22,7 +22,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: linux.8,v 1.6 1999/08/04 18:58:37 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 9, 1997
 .Dt LINUX 8
diff --git a/sys/modules/linux/linux.sh b/sys/modules/linux/linux.sh
index 8545fbbc47bc7..aad1331a274cc 100644
--- a/sys/modules/linux/linux.sh
+++ b/sys/modules/linux/linux.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $Id: linux,v 1.5 1998/09/07 16:15:59 cracauer Exp $
+# $FreeBSD$
 
 FOUND=`kldstat -v | egrep 'linux(aout|elf)'`
 
diff --git a/sys/modules/mfs/Makefile b/sys/modules/mfs/Makefile
index 6fde55f65ac30..a5cbc9e4ba73d 100644
--- a/sys/modules/mfs/Makefile
+++ b/sys/modules/mfs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1998/10/16 04:30:47 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../ufs/mfs
 KMOD=	mfs
diff --git a/sys/modules/mii/Makefile b/sys/modules/mii/Makefile
index 4e3d5d20563d4..4cb73b089691a 100644
--- a/sys/modules/mii/Makefile
+++ b/sys/modules/mii/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/08/21 17:40:39 wpaul Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/dev/mii
diff --git a/sys/modules/msdos/Makefile b/sys/modules/msdos/Makefile
index cc8102277349f..777aa2a251b6c 100644
--- a/sys/modules/msdos/Makefile
+++ b/sys/modules/msdos/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.6 1998/02/06 23:54:22 eivind Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../msdosfs
 KMOD=	msdos
diff --git a/sys/modules/msdosfs/Makefile b/sys/modules/msdosfs/Makefile
index cc8102277349f..777aa2a251b6c 100644
--- a/sys/modules/msdosfs/Makefile
+++ b/sys/modules/msdosfs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.6 1998/02/06 23:54:22 eivind Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../msdosfs
 KMOD=	msdos
diff --git a/sys/modules/mx/Makefile b/sys/modules/mx/Makefile
index ae4ea4f67c776..cad21d2d87c86 100644
--- a/sys/modules/mx/Makefile
+++ b/sys/modules/mx/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/07/24 20:55:05 wpaul Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
diff --git a/sys/modules/nfs/Makefile b/sys/modules/nfs/Makefile
index 719adcd2692a0..113d58922c052 100644
--- a/sys/modules/nfs/Makefile
+++ b/sys/modules/nfs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.10 1998/07/07 02:27:09 bde Exp $
+# $FreeBSD$
 
 .PATH: ${.CURDIR}/../../nfs
 KMOD=	nfs
diff --git a/sys/modules/nfsclient/Makefile b/sys/modules/nfsclient/Makefile
index 719adcd2692a0..113d58922c052 100644
--- a/sys/modules/nfsclient/Makefile
+++ b/sys/modules/nfsclient/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.10 1998/07/07 02:27:09 bde Exp $
+# $FreeBSD$
 
 .PATH: ${.CURDIR}/../../nfs
 KMOD=	nfs
diff --git a/sys/modules/nfsserver/Makefile b/sys/modules/nfsserver/Makefile
index 719adcd2692a0..113d58922c052 100644
--- a/sys/modules/nfsserver/Makefile
+++ b/sys/modules/nfsserver/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.10 1998/07/07 02:27:09 bde Exp $
+# $FreeBSD$
 
 .PATH: ${.CURDIR}/../../nfs
 KMOD=	nfs
diff --git a/sys/modules/ntfs/Makefile b/sys/modules/ntfs/Makefile
index 05beab5ac08fa..0aea8277177b3 100644
--- a/sys/modules/ntfs/Makefile
+++ b/sys/modules/ntfs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/01/02 01:12:19 semen Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../ntfs
 KMOD=	ntfs
diff --git a/sys/modules/nullfs/Makefile b/sys/modules/nullfs/Makefile
index 4b1957611a31b..3fd3568b86863 100644
--- a/sys/modules/nullfs/Makefile
+++ b/sys/modules/nullfs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.6 1998/02/06 23:54:26 eivind Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../miscfs/nullfs
 KMOD=	null
diff --git a/sys/modules/pcic/Makefile b/sys/modules/pcic/Makefile
index 550d58922a49d..3cf3974607109 100644
--- a/sys/modules/pcic/Makefile
+++ b/sys/modules/pcic/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.7 1998/10/16 04:30:48 peter Exp $
+# $FreeBSD$
 
 .PATH:  ${.CURDIR}/../../pccard
 KMOD=   pcic
diff --git a/sys/modules/pn/Makefile b/sys/modules/pn/Makefile
index 839832652fdfc..dc567a6ffdac3 100644
--- a/sys/modules/pn/Makefile
+++ b/sys/modules/pn/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/07/24 20:55:05 wpaul Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
diff --git a/sys/modules/portal/Makefile b/sys/modules/portal/Makefile
index 0d35dd9c5c88c..f6037ff996f59 100644
--- a/sys/modules/portal/Makefile
+++ b/sys/modules/portal/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1997/02/22 12:48:47 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../miscfs/portal
 KMOD=	portal
diff --git a/sys/modules/portalfs/Makefile b/sys/modules/portalfs/Makefile
index 0d35dd9c5c88c..f6037ff996f59 100644
--- a/sys/modules/portalfs/Makefile
+++ b/sys/modules/portalfs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1997/02/22 12:48:47 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../miscfs/portal
 KMOD=	portal
diff --git a/sys/modules/procfs/Makefile b/sys/modules/procfs/Makefile
index 1ff51be5dd8cc..068c512995639 100644
--- a/sys/modules/procfs/Makefile
+++ b/sys/modules/procfs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.13 1998/10/16 04:30:48 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../miscfs/procfs
 KMOD=	procfs
diff --git a/sys/modules/sf/Makefile b/sys/modules/sf/Makefile
index d2de96eb0f67c..0e7509634a320 100644
--- a/sys/modules/sf/Makefile
+++ b/sys/modules/sf/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/07/25 04:32:38 wpaul Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
diff --git a/sys/modules/sk/Makefile b/sys/modules/sk/Makefile
index 3aefa89cd13cc..da9f5075fc7a1 100644
--- a/sys/modules/sk/Makefile
+++ b/sys/modules/sk/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/07/23 05:47:56 wpaul Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
diff --git a/sys/modules/splash/Makefile b/sys/modules/splash/Makefile
index 3d3d48b05bf86..1c634bf4bf983 100644
--- a/sys/modules/splash/Makefile
+++ b/sys/modules/splash/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1999/01/11 03:34:52 yokota Exp $
+# $FreeBSD$
 
 SUBDIR=	bmp pcx
 
diff --git a/sys/modules/splash/Makefile.inc b/sys/modules/splash/Makefile.inc
index 64212f6bfa21d..265f86d1ed55a 100644
--- a/sys/modules/splash/Makefile.inc
+++ b/sys/modules/splash/Makefile.inc
@@ -1,3 +1,3 @@
-# $Id: $
+# $FreeBSD$
 
 .include "../Makefile.inc"
diff --git a/sys/modules/splash/bmp/Makefile b/sys/modules/splash/bmp/Makefile
index 798e7e4283894..af009a2826196 100644
--- a/sys/modules/splash/bmp/Makefile
+++ b/sys/modules/splash/bmp/Makefile
@@ -1,4 +1,4 @@
-# $Id: $
+# $FreeBSD$
 
 KMOD=	splash_bmp
 SRCS= 	splash_bmp.c
diff --git a/sys/modules/splash/bmp/splash_bmp.c b/sys/modules/splash/bmp/splash_bmp.c
index 6de5a28274d29..71a53b9c38a46 100644
--- a/sys/modules/splash/bmp/splash_bmp.c
+++ b/sys/modules/splash/bmp/splash_bmp.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: splash_bmp.c,v 1.8 1999/06/16 14:04:45 yokota Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/splash/pcx/Makefile b/sys/modules/splash/pcx/Makefile
index baf064c5b9725..a64a61864db27 100644
--- a/sys/modules/splash/pcx/Makefile
+++ b/sys/modules/splash/pcx/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 KMOD=	splash_pcx
 SRCS=	splash_pcx.c
diff --git a/sys/modules/splash/pcx/splash_pcx.c b/sys/modules/splash/pcx/splash_pcx.c
index 9b81c3f7ae7de..544e8c795785e 100644
--- a/sys/modules/splash/pcx/splash_pcx.c
+++ b/sys/modules/splash/pcx/splash_pcx.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: splash_pcx.c,v 1.2 1999/06/22 14:14:06 yokota Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/ste/Makefile b/sys/modules/ste/Makefile
index 423e2ad353e75..d078a43666df2 100644
--- a/sys/modules/ste/Makefile
+++ b/sys/modules/ste/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/07/24 20:55:04 wpaul Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
diff --git a/sys/modules/streams/Makefile b/sys/modules/streams/Makefile
index 8c83443d32b0c..0298460034977 100644
--- a/sys/modules/streams/Makefile
+++ b/sys/modules/streams/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.11 1999/02/01 00:52:21 grog Exp $ 
+# $FreeBSD$ 
 
 MAINTAINER  =  newton@atdot.dotat.org
 SOURCE=	${.CURDIR}/../../dev/streams
diff --git a/sys/modules/svr4/Makefile b/sys/modules/svr4/Makefile
index 94a945b6a01c8..8d9b050b19d10 100644
--- a/sys/modules/svr4/Makefile
+++ b/sys/modules/svr4/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/01/30 06:29:48 newton Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../i386/svr4 ${.CURDIR}/../../svr4
 KMOD=	svr4
diff --git a/sys/modules/svr4/README b/sys/modules/svr4/README
index c8a0aee38db49..0578721e36393 100644
--- a/sys/modules/svr4/README
+++ b/sys/modules/svr4/README
@@ -35,4 +35,4 @@ things)).  Patches will be appreciated (use send-pr).
    - Mark Newton
      newton@atdot.dotat.org
 
-$Id$
+$FreeBSD$
diff --git a/sys/modules/svr4/TO-DO b/sys/modules/svr4/TO-DO
index ad4d46abbba40..078b80d8943a3 100644
--- a/sys/modules/svr4/TO-DO
+++ b/sys/modules/svr4/TO-DO
@@ -12,4 +12,4 @@ TO-DO list
   * Make SysV emulator use SysV shared memory support (duh)
 
 
-$Id$
+$FreeBSD$
diff --git a/sys/modules/svr4/svr4.sh b/sys/modules/svr4/svr4.sh
index 6acf6689334a3..4cb76777fdec4 100644
--- a/sys/modules/svr4/svr4.sh
+++ b/sys/modules/svr4/svr4.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $Id: svr4.sh,v 1.1 1999/01/30 06:29:48 newton Exp $
+# $FreeBSD$
 
 STREAMS=`kldstat -v | egrep 'streams'`
 SVR4=`kldstat -v | egrep 'svr4elf'`
diff --git a/sys/modules/syscons/Makefile b/sys/modules/syscons/Makefile
index 14c8f2fee1768..cbcdc08303a76 100644
--- a/sys/modules/syscons/Makefile
+++ b/sys/modules/syscons/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 1998/12/31 13:42:00 des Exp $
+# $FreeBSD$
 
 SUBDIR=	blank daemon fade green logo rain snake star warp fire
 
diff --git a/sys/modules/syscons/Makefile.inc b/sys/modules/syscons/Makefile.inc
index 60392e0a0bf34..265f86d1ed55a 100644
--- a/sys/modules/syscons/Makefile.inc
+++ b/sys/modules/syscons/Makefile.inc
@@ -1,3 +1,3 @@
-# $Id$
+# $FreeBSD$
 
 .include "../Makefile.inc"
diff --git a/sys/modules/syscons/blank/Makefile b/sys/modules/syscons/blank/Makefile
index 4f881865a8188..e299c924f7a95 100644
--- a/sys/modules/syscons/blank/Makefile
+++ b/sys/modules/syscons/blank/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 1998/02/01 17:59:51 bde Exp $
+# $FreeBSD$
 
 KMOD=	blank_saver
 SRCS= 	blank_saver.c
diff --git a/sys/modules/syscons/blank/blank_saver.c b/sys/modules/syscons/blank/blank_saver.c
index 2979c0da94423..960acca5a5122 100644
--- a/sys/modules/syscons/blank/blank_saver.c
+++ b/sys/modules/syscons/blank/blank_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: blank_saver.c,v 1.15 1999/01/11 03:18:44 yokota Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/daemon/Makefile b/sys/modules/syscons/daemon/Makefile
index 4f0e6a3624e01..ea34077841919 100644
--- a/sys/modules/syscons/daemon/Makefile
+++ b/sys/modules/syscons/daemon/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1998/02/01 17:59:52 bde Exp $
+# $FreeBSD$
 
 KMOD=	daemon_saver
 SRCS= 	daemon_saver.c
diff --git a/sys/modules/syscons/daemon/daemon_saver.c b/sys/modules/syscons/daemon/daemon_saver.c
index ebedfaa2e8c03..bc03f6446401b 100644
--- a/sys/modules/syscons/daemon/daemon_saver.c
+++ b/sys/modules/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.15 1999/02/05 12:40:15 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/fade/Makefile b/sys/modules/syscons/fade/Makefile
index d5ac4067ecc23..5fc34ebfe19c4 100644
--- a/sys/modules/syscons/fade/Makefile
+++ b/sys/modules/syscons/fade/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 1998/02/01 17:59:53 bde Exp $
+# $FreeBSD$
 
 KMOD=	fade_saver
 SRCS= 	fade_saver.c
diff --git a/sys/modules/syscons/fade/fade_saver.c b/sys/modules/syscons/fade/fade_saver.c
index 4a44c8519bcc5..052fa92259080 100644
--- a/sys/modules/syscons/fade/fade_saver.c
+++ b/sys/modules/syscons/fade/fade_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: fade_saver.c,v 1.16 1999/01/11 03:18:46 yokota Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/fire/fire_saver.c b/sys/modules/syscons/fire/fire_saver.c
index db4b80b1a7b06..59c7079161607 100644
--- a/sys/modules/syscons/fire/fire_saver.c
+++ b/sys/modules/syscons/fire/fire_saver.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: fire_saver.c,v 1.4 1999/05/10 15:25:50 des Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/modules/syscons/green/Makefile b/sys/modules/syscons/green/Makefile
index 9d8d1a3115cef..f62b1f4a2757e 100644
--- a/sys/modules/syscons/green/Makefile
+++ b/sys/modules/syscons/green/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 1998/02/01 17:59:54 bde Exp $
+# $FreeBSD$
 
 KMOD=	green_saver
 SRCS= 	green_saver.c
diff --git a/sys/modules/syscons/green/green_saver.c b/sys/modules/syscons/green/green_saver.c
index 103154be7a8db..d6cfe80da6897 100644
--- a/sys/modules/syscons/green/green_saver.c
+++ b/sys/modules/syscons/green/green_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: green_saver.c,v 1.15 1999/01/11 03:18:48 yokota Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/logo/Makefile b/sys/modules/syscons/logo/Makefile
index 1bccccdbde1a4..2a9ede26cce9b 100644
--- a/sys/modules/syscons/logo/Makefile
+++ b/sys/modules/syscons/logo/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1998/12/28 14:22:57 des Exp $
+# $FreeBSD$
 
 KMOD=	logo_saver
 SRCS= 	logo_saver.c
diff --git a/sys/modules/syscons/logo/logo_saver.c b/sys/modules/syscons/logo/logo_saver.c
index 24da9644a17fa..2d2c660847ac4 100644
--- a/sys/modules/syscons/logo/logo_saver.c
+++ b/sys/modules/syscons/logo/logo_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: logo_saver.c,v 1.6 1999/04/12 13:34:57 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/rain/Makefile b/sys/modules/syscons/rain/Makefile
index 8b964f34a0fa0..ecc5ec3325812 100644
--- a/sys/modules/syscons/rain/Makefile
+++ b/sys/modules/syscons/rain/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1998/12/27 22:03:09 des Exp $
+# $FreeBSD$
 
 KMOD=	rain_saver
 SRCS= 	rain_saver.c
diff --git a/sys/modules/syscons/rain/rain_saver.c b/sys/modules/syscons/rain/rain_saver.c
index 200dc59931f0a..6d2ed39e46545 100644
--- a/sys/modules/syscons/rain/rain_saver.c
+++ b/sys/modules/syscons/rain/rain_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: rain_saver.c,v 1.3 1999/04/12 13:34:57 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/snake/Makefile b/sys/modules/syscons/snake/Makefile
index 88a7bfc987221..6dab3edc9ac2b 100644
--- a/sys/modules/syscons/snake/Makefile
+++ b/sys/modules/syscons/snake/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 1998/02/01 17:59:58 bde Exp $
+# $FreeBSD$
 
 KMOD=	snake_saver
 SRCS= 	snake_saver.c
diff --git a/sys/modules/syscons/snake/snake_saver.c b/sys/modules/syscons/snake/snake_saver.c
index 51e1746f5f9d7..093e564bef135 100644
--- a/sys/modules/syscons/snake/snake_saver.c
+++ b/sys/modules/syscons/snake/snake_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.23 1999/02/05 12:40:15 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/star/Makefile b/sys/modules/syscons/star/Makefile
index 02a8456e8dc0b..7ae11d782852e 100644
--- a/sys/modules/syscons/star/Makefile
+++ b/sys/modules/syscons/star/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 1998/02/01 17:59:59 bde Exp $
+# $FreeBSD$
 
 KMOD=	star_saver
 SRCS= 	star_saver.c
diff --git a/sys/modules/syscons/star/star_saver.c b/sys/modules/syscons/star/star_saver.c
index 56408dc78ceef..645e4fd3c354f 100644
--- a/sys/modules/syscons/star/star_saver.c
+++ b/sys/modules/syscons/star/star_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.20 1999/02/05 12:40:16 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/syscons/warp/Makefile b/sys/modules/syscons/warp/Makefile
index 3902ca0eac538..45a3af9ecb23f 100644
--- a/sys/modules/syscons/warp/Makefile
+++ b/sys/modules/syscons/warp/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1998/12/27 22:03:09 des Exp $
+# $FreeBSD$
 
 KMOD=	warp_saver
 SRCS= 	warp_saver.c
diff --git a/sys/modules/syscons/warp/warp_saver.c b/sys/modules/syscons/warp/warp_saver.c
index cd6f42b3358bb..7e5140720713b 100644
--- a/sys/modules/syscons/warp/warp_saver.c
+++ b/sys/modules/syscons/warp/warp_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: warp_saver.c,v 1.5 1999/04/12 13:34:58 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/modules/ti/Makefile b/sys/modules/ti/Makefile
index 9fd0b6b0fc378..6f4844d7c6b5c 100644
--- a/sys/modules/ti/Makefile
+++ b/sys/modules/ti/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/07/23 05:47:58 wpaul Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
diff --git a/sys/modules/tl/Makefile b/sys/modules/tl/Makefile
index 250e268bb0ab5..e1f03399e4e97 100644
--- a/sys/modules/tl/Makefile
+++ b/sys/modules/tl/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1999/08/27 19:45:18 wpaul Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
diff --git a/sys/modules/umapfs/Makefile b/sys/modules/umapfs/Makefile
index 6a1332c127238..28acc62ee6469 100644
--- a/sys/modules/umapfs/Makefile
+++ b/sys/modules/umapfs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1997/02/22 12:49:25 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../miscfs/umapfs
 KMOD=	umap
diff --git a/sys/modules/union/Makefile b/sys/modules/union/Makefile
index defca0bcc7d14..ff0ab8a32539f 100644
--- a/sys/modules/union/Makefile
+++ b/sys/modules/union/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1997/02/22 12:49:27 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../miscfs/union
 KMOD=	union
diff --git a/sys/modules/unionfs/Makefile b/sys/modules/unionfs/Makefile
index defca0bcc7d14..ff0ab8a32539f 100644
--- a/sys/modules/unionfs/Makefile
+++ b/sys/modules/unionfs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1997/02/22 12:49:27 peter Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../miscfs/union
 KMOD=	union
diff --git a/sys/modules/vesa/Makefile b/sys/modules/vesa/Makefile
index ab9be45aa6128..f38483fb54c76 100644
--- a/sys/modules/vesa/Makefile
+++ b/sys/modules/vesa/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.5 1999/01/11 03:18:56 yokota Exp $
+# $FreeBSD$
 
 .PATH:	${.CURDIR}/../../dev/syscons ${.CURDIR}/../../i386/isa
 KMOD	=	vesa
diff --git a/sys/modules/vinum/Makefile b/sys/modules/vinum/Makefile
index f8cb0bbcf23d5..b717bbc2b7f15 100644
--- a/sys/modules/vinum/Makefile
+++ b/sys/modules/vinum/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile.vinum,v 1.2 1999/02/11 05:19:49 grog Exp grog $ 
+# $FreeBSD$ 
 
 MAINTAINER  =  grog@FreeBSD.org
 SOURCE=	${.CURDIR}/../../dev/vinum
diff --git a/sys/modules/vn/Makefile b/sys/modules/vn/Makefile
index 2f7407b470f14..929969d0cba74 100644
--- a/sys/modules/vn/Makefile
+++ b/sys/modules/vn/Makefile
@@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.1 1999/01/21 17:18:34 peter Exp $ 
+# $FreeBSD$ 
 
 .PATH:  ${.CURDIR}/../../dev/vn
 KMOD=   vn
diff --git a/sys/modules/vr/Makefile b/sys/modules/vr/Makefile
index 468419ae9d655..cd9257dd66393 100644
--- a/sys/modules/vr/Makefile
+++ b/sys/modules/vr/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/07/23 05:48:01 wpaul Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
diff --git a/sys/modules/wb/Makefile b/sys/modules/wb/Makefile
index 862449c77861b..0b8f4de8b80df 100644
--- a/sys/modules/wb/Makefile
+++ b/sys/modules/wb/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/07/23 05:48:01 wpaul Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
diff --git a/sys/modules/xl/Makefile b/sys/modules/xl/Makefile
index 544cc4814948f..6a5b533c1fcf5 100644
--- a/sys/modules/xl/Makefile
+++ b/sys/modules/xl/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/07/23 05:48:01 wpaul Exp $
+# $FreeBSD$
 
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
diff --git a/sys/msdosfs/bootsect.h b/sys/msdosfs/bootsect.h
index 11b93371a534d..666c0f8f41b1c 100644
--- a/sys/msdosfs/bootsect.h
+++ b/sys/msdosfs/bootsect.h
@@ -1,4 +1,4 @@
-/*	$Id: bootsect.h,v 1.5 1997/02/22 09:40:43 peter Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: bootsect.h,v 1.9 1997/11/17 15:36:17 ws Exp $	*/
 
 /*
diff --git a/sys/msdosfs/bpb.h b/sys/msdosfs/bpb.h
index bc00a758de51d..88b9eefb859a8 100644
--- a/sys/msdosfs/bpb.h
+++ b/sys/msdosfs/bpb.h
@@ -1,4 +1,4 @@
-/*	$Id: bpb.h,v 1.5 1997/02/22 09:40:44 peter Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: bpb.h,v 1.7 1997/11/17 15:36:24 ws Exp $	*/
 
 /*
diff --git a/sys/msdosfs/denode.h b/sys/msdosfs/denode.h
index ba2ef8c65dab1..49eac87a20755 100644
--- a/sys/msdosfs/denode.h
+++ b/sys/msdosfs/denode.h
@@ -1,4 +1,4 @@
-/*	$Id: denode.h,v 1.17 1998/11/21 00:20:24 dt Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: denode.h,v 1.25 1997/11/17 15:36:28 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/direntry.h b/sys/msdosfs/direntry.h
index 796fe78131c8e..3225b78b8936e 100644
--- a/sys/msdosfs/direntry.h
+++ b/sys/msdosfs/direntry.h
@@ -1,4 +1,4 @@
-/*	$Id: direntry.h,v 1.12 1998/02/26 06:45:42 msmith Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: direntry.h,v 1.14 1997/11/17 15:36:32 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/fat.h b/sys/msdosfs/fat.h
index 74b05e2cf78db..9f20cbae41998 100644
--- a/sys/msdosfs/fat.h
+++ b/sys/msdosfs/fat.h
@@ -1,4 +1,4 @@
-/*	$Id: fat.h,v 1.6 1997/02/22 09:40:45 peter Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: fat.h,v 1.12 1997/11/17 15:36:36 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/msdosfs_conv.c b/sys/msdosfs/msdosfs_conv.c
index 2c792ebf89bbb..8c43f93c0adc6 100644
--- a/sys/msdosfs/msdosfs_conv.c
+++ b/sys/msdosfs/msdosfs_conv.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_conv.c,v 1.27 1998/05/17 21:18:08 dt Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_conv.c,v 1.25 1997/11/17 15:36:40 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/msdosfs_denode.c b/sys/msdosfs/msdosfs_denode.c
index 3c6f9d9179fc9..d864ddb5cea98 100644
--- a/sys/msdosfs/msdosfs_denode.c
+++ b/sys/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_denode.c,v 1.44 1999/01/02 11:34:56 bde Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_denode.c,v 1.28 1998/02/10 14:10:00 mrg Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/msdosfs_fat.c b/sys/msdosfs/msdosfs_fat.c
index 1ec29db1d9c09..fae002774668f 100644
--- a/sys/msdosfs/msdosfs_fat.c
+++ b/sys/msdosfs/msdosfs_fat.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_fat.c,v 1.20 1998/04/06 11:39:04 phk Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_fat.c,v 1.28 1997/11/17 15:36:49 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/msdosfs_lookup.c b/sys/msdosfs/msdosfs_lookup.c
index d2ad431d7f444..95e8e898ad305 100644
--- a/sys/msdosfs/msdosfs_lookup.c
+++ b/sys/msdosfs/msdosfs_lookup.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_lookup.c,v 1.28 1999/01/02 18:52:13 dt Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_lookup.c,v 1.37 1997/11/17 15:36:54 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c
index adb5b5a0ebbf9..92f00846514d5 100644
--- a/sys/msdosfs/msdosfs_vfsops.c
+++ b/sys/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vfsops.c,v 1.48 1999/08/23 21:07:13 bde Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index 3c0a033e8d3f5..2407e2e8a7207 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vnops.c,v 1.87 1999/07/25 04:01:32 bde Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $	*/
 
 /*-
diff --git a/sys/msdosfs/msdosfsmount.h b/sys/msdosfs/msdosfsmount.h
index 31a2a67560660..6bd6551341f07 100644
--- a/sys/msdosfs/msdosfsmount.h
+++ b/sys/msdosfs/msdosfsmount.h
@@ -1,4 +1,4 @@
-/*	$Id: msdosfsmount.h,v 1.15 1998/02/23 09:39:29 ache Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: msdosfsmount.h,v 1.17 1997/11/17 15:37:07 ws Exp $	*/
 
 /*-
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index 511ec3e3a06bb..0e73b83c6df50 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -37,7 +37,7 @@
  *
  *      @(#)bpf.c	8.2 (Berkeley) 3/28/94
  *
- * $Id: bpf.c,v 1.52 1999/07/06 19:23:10 des Exp $
+ * $FreeBSD$
  */
 
 #include "bpf.h"
diff --git a/sys/net/bpf.h b/sys/net/bpf.h
index cc3ed962e7b94..fa5e46cc48445 100644
--- a/sys/net/bpf.h
+++ b/sys/net/bpf.h
@@ -38,7 +38,7 @@
  *      @(#)bpf.h	8.1 (Berkeley) 6/10/93
  *	@(#)bpf.h	1.34 (LBL)     6/16/96
  *
- * $Id: bpf.h,v 1.15 1998/09/15 19:35:37 fenner Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_BPF_H_
diff --git a/sys/net/bpf_compat.h b/sys/net/bpf_compat.h
index c09d54c09a752..0936b84903169 100644
--- a/sys/net/bpf_compat.h
+++ b/sys/net/bpf_compat.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)bpf_compat.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NET_BPF_COMPAT_H_
diff --git a/sys/net/bpf_filter.c b/sys/net/bpf_filter.c
index ab2b088e8cccd..bff916348c53a 100644
--- a/sys/net/bpf_filter.c
+++ b/sys/net/bpf_filter.c
@@ -37,7 +37,7 @@
  *
  *      @(#)bpf_filter.c	8.1 (Berkeley) 6/10/93
  *
- * $Id: bpf_filter.c,v 1.13 1999/04/11 02:52:31 eivind Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/net/bpfdesc.h b/sys/net/bpfdesc.h
index 39ac4897915ff..d87cc40b2f904 100644
--- a/sys/net/bpfdesc.h
+++ b/sys/net/bpfdesc.h
@@ -37,7 +37,7 @@
  *
  *      @(#)bpfdesc.h	8.1 (Berkeley) 6/10/93
  *
- * $Id: bpfdesc.h,v 1.11 1998/11/11 10:04:09 truckman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_BPFDESC_H_
diff --git a/sys/net/bsd_comp.c b/sys/net/bsd_comp.c
index fde1f92833ddd..d5072cc11b7bd 100644
--- a/sys/net/bsd_comp.c
+++ b/sys/net/bsd_comp.c
@@ -40,7 +40,7 @@
 /*
  * This version is for use with mbufs on BSD-derived systems.
  *
- * $Id: bsd_comp.c,v 1.9 1997/09/02 01:18:31 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/net/ethernet.h b/sys/net/ethernet.h
index c9c03a7c9249c..c8b62e0c57241 100644
--- a/sys/net/ethernet.h
+++ b/sys/net/ethernet.h
@@ -1,7 +1,7 @@
 /*
  * Fundamental constants relating to ethernet.
  *
- * $Id: ethernet.h,v 1.8 1997/02/22 09:40:58 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/net/fddi.h b/sys/net/fddi.h
index 336ff4768cd6e..fc6acc6c9c8fc 100644
--- a/sys/net/fddi.h
+++ b/sys/net/fddi.h
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_fddi.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IF_FDDI_H_
diff --git a/sys/net/hostcache.c b/sys/net/hostcache.c
index 74b3916ae5d03..0a1d4c00d912a 100644
--- a/sys/net/hostcache.c
+++ b/sys/net/hostcache.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: hostcache.c,v 1.4 1998/02/04 22:33:02 eivind Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/net/hostcache.h b/sys/net/hostcache.h
index 1e1280349261a..6ffb9ace5e3a5 100644
--- a/sys/net/hostcache.h
+++ b/sys/net/hostcache.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: hostcache.h,v 1.1 1997/06/18 01:24:22 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_HOSTCACHE_H
diff --git a/sys/net/if.c b/sys/net/if.c
index 1887c91a9c776..b5faac71040ae 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.c	8.3 (Berkeley) 1/4/94
- *	$Id: if.c,v 1.73 1999/06/19 18:42:26 phk Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/net/if.h b/sys/net/if.h
index 23f6dfcd3ca02..8ceea66b9fc02 100644
--- a/sys/net/if.h
+++ b/sys/net/if.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if.h	8.1 (Berkeley) 6/10/93
- *	$Id: if.h,v 1.54 1999/06/19 18:42:27 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_IF_H_
diff --git a/sys/net/if_arp.h b/sys/net/if_arp.h
index e33abaec7e5e0..97902a75b945e 100644
--- a/sys/net/if_arp.h
+++ b/sys/net/if_arp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_arp.h	8.1 (Berkeley) 6/10/93
- * $Id: if_arp.h,v 1.10 1998/01/10 07:29:10 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_IF_ARP_H_
diff --git a/sys/net/if_disc.c b/sys/net/if_disc.c
index c0375a735a634..a1981f74ace8f 100644
--- a/sys/net/if_disc.c
+++ b/sys/net/if_disc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)if_loop.c	8.1 (Berkeley) 6/10/93
- *	$Id: if_disc.c,v 1.21 1998/12/14 01:59:16 eivind Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/net/if_dl.h b/sys/net/if_dl.h
index 19a573c8bb9a4..aac7c1439dcef 100644
--- a/sys/net/if_dl.h
+++ b/sys/net/if_dl.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_dl.h	8.1 (Berkeley) 6/10/93
- * $Id: if_dl.h,v 1.6 1997/02/22 09:41:00 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_IF_DL_H_
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index ce72cbd72b16b..489bcb2c33615 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ethersubr.c	8.1 (Berkeley) 6/10/93
- * $Id: if_ethersubr.c,v 1.55 1999/01/31 08:17:16 julian Exp $
+ * $FreeBSD$
  */
 
 #include "opt_atalk.h"
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index dbc4be8e92368..c4d65ec4edf14 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	from: if_ethersubr.c,v 1.5 1994/12/13 22:31:45 wollman Exp
- * $Id: if_fddisubr.c,v 1.34 1999/01/27 22:42:13 dillon Exp $
+ * $FreeBSD$
  */
 
 #include "opt_atalk.h"
diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c
index 8df7aa3e0279a..495362b5c1307 100644
--- a/sys/net/if_iso88025subr.c
+++ b/sys/net/if_iso88025subr.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_iso88025subr.c,v 1.2 1999/03/10 10:11:43 julian Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/net/if_llc.h b/sys/net/if_llc.h
index 3cdf6521679c5..8bcd63e5646ab 100644
--- a/sys/net/if_llc.h
+++ b/sys/net/if_llc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *      @(#)if_llc.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NET_IF_LLC_H_
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 47663e829d04f..e1607903f3df5 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_loop.c	8.1 (Berkeley) 6/10/93
- * $Id: if_loop.c,v 1.40 1999/08/06 13:53:02 brian Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/net/if_media.c b/sys/net/if_media.c
index 50369dac6f585..128b924697585 100644
--- a/sys/net/if_media.c
+++ b/sys/net/if_media.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_media.c,v 1.1 1997/03/17 02:55:15 thorpej Exp $	*/
-/*	$Id: if_media.c,v 1.7 1999/04/16 21:22:45 peter Exp $ */
+/* $FreeBSD$ */
 
 /*
  * Copyright (c) 1997
diff --git a/sys/net/if_media.h b/sys/net/if_media.h
index e363485fa2cce..a097ce71a307b 100644
--- a/sys/net/if_media.h
+++ b/sys/net/if_media.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_media.h,v 1.3 1997/03/26 01:19:27 thorpej Exp $	*/
-/*	$Id: if_media.h,v 1.5 1999/03/07 04:39:25 wpaul Exp $ */
+/* $FreeBSD$ */
 
 /*
  * Copyright (c) 1997
diff --git a/sys/net/if_mib.c b/sys/net/if_mib.c
index b07927359f390..a4489ca01e4ef 100644
--- a/sys/net/if_mib.c
+++ b/sys/net/if_mib.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_mib.c,v 1.6 1998/12/04 22:54:52 archie Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/net/if_mib.h b/sys/net/if_mib.h
index 94abc47ca66ed..6c29389f68765 100644
--- a/sys/net/if_mib.h
+++ b/sys/net/if_mib.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _NET_IF_MIB_H
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index 4e666b385ccc2..f781204da1e5a 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -69,7 +69,7 @@
  * Paul Mackerras (paulus@cs.anu.edu.au).
  */
 
-/* $Id: if_ppp.c,v 1.62 1999/08/06 13:53:02 brian Exp $ */
+/* $FreeBSD$ */
 /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */
 /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */
 
diff --git a/sys/net/if_ppp.h b/sys/net/if_ppp.h
index d49a5dffc162b..713d39a22a305 100644
--- a/sys/net/if_ppp.h
+++ b/sys/net/if_ppp.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: if_ppp.h,v 1.12 1997/10/18 00:49:59 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _IF_PPP_H_
diff --git a/sys/net/if_pppvar.h b/sys/net/if_pppvar.h
index c764daf77728f..e4b4fd7cfcc67 100644
--- a/sys/net/if_pppvar.h
+++ b/sys/net/if_pppvar.h
@@ -39,7 +39,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: if_pppvar.h,v 1.12 1997/10/18 00:46:10 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index cce2fa60b1fa6..74aad170abe2b 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_sl.c	8.6 (Berkeley) 2/1/94
- * $Id: if_sl.c,v 1.75 1999/07/01 22:14:51 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/net/if_slvar.h b/sys/net/if_slvar.h
index db88bfdcd0652..06ac4d9615242 100644
--- a/sys/net/if_slvar.h
+++ b/sys/net/if_slvar.h
@@ -32,7 +32,7 @@
  *
  *	@(#)if_slvar.h	8.3 (Berkeley) 2/1/94
  *
- * $Id: if_slvar.h,v 1.14 1997/09/21 22:01:05 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_IF_SLVAR_H_
diff --git a/sys/net/if_sppp.h b/sys/net/if_sppp.h
index 6c88766fcfd32..5d47287a4f11d 100644
--- a/sys/net/if_sppp.h
+++ b/sys/net/if_sppp.h
@@ -16,7 +16,7 @@
  *
  * From: Version 2.0, Fri Oct  6 20:39:21 MSK 1995
  *
- * $Id: if_sppp.h,v 1.13 1998/12/27 21:30:44 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_IF_SPPP_H_
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index 380f58877b749..1f079908cc6ee 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -17,7 +17,7 @@
  *
  * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997
  *
- * $Id: if_spppsubr.c,v 1.54 1999/02/23 15:08:44 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/net/if_tun.h b/sys/net/if_tun.h
index 1a1fa64619547..999372bb9207f 100644
--- a/sys/net/if_tun.h
+++ b/sys/net/if_tun.h
@@ -13,7 +13,7 @@
  * UCL. This driver is based much more on read/write/select mode of
  * operation though.
  *
- * $Id: if_tun.h,v 1.13 1998/04/17 22:36:56 des Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_IF_TUN_H_
diff --git a/sys/net/if_tunvar.h b/sys/net/if_tunvar.h
index 8a0e9b55d24b2..2e9703f479623 100644
--- a/sys/net/if_tunvar.h
+++ b/sys/net/if_tunvar.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_tunvar.h,v 1.4 1999/03/24 21:20:12 des Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_IF_TUNVAR_H_
diff --git a/sys/net/if_types.h b/sys/net/if_types.h
index 833ba471c378c..ebcbcbfef19f0 100644
--- a/sys/net/if_types.h
+++ b/sys/net/if_types.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_types.h	8.2 (Berkeley) 4/20/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NET_IF_TYPES_H_
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index 8163f60e2fcc4..a598d193973cb 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)if.h	8.1 (Berkeley) 6/10/93
- *	$Id: if_var.h,v 1.13 1999/05/16 17:09:20 pb Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_NET_IF_VAR_H_
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 3e23fda037c1a..dac28c8e520cb 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_vlan.c,v 1.7 1999/04/07 23:26:43 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h
index 7498cbfecccc9..a9679ea0b5ef2 100644
--- a/sys/net/if_vlan_var.h
+++ b/sys/net/if_vlan_var.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_vlan_var.h,v 1.3 1999/03/15 00:33:02 wpaul Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_IF_VLAN_VAR_H_
diff --git a/sys/net/iso88025.h b/sys/net/iso88025.h
index 70ecdc0c016f8..ccb16e16836a1 100644
--- a/sys/net/iso88025.h
+++ b/sys/net/iso88025.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: iso88025.h,v 1.10 1999/01/09 19:01:58 lile Exp $
+ * $FreeBSD$
  *
  * Information gathered from tokenring@freebsd, /sys/net/ethernet.h and
  * the Mach token ring driver.
diff --git a/sys/net/netisr.h b/sys/net/netisr.h
index 65aeb107327a6..9ad7f6b2c3995 100644
--- a/sys/net/netisr.h
+++ b/sys/net/netisr.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)netisr.h	8.1 (Berkeley) 6/10/93
- * $Id: netisr.h,v 1.14 1998/06/07 11:52:17 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_NETISR_H_
diff --git a/sys/net/ppp_comp.h b/sys/net/ppp_comp.h
index c187deee69204..b777bfc2d3b0f 100644
--- a/sys/net/ppp_comp.h
+++ b/sys/net/ppp_comp.h
@@ -24,7 +24,7 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
- * $Id: ppp_comp.h,v 1.6 1998/03/22 06:51:55 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_PPP_COMP_H
diff --git a/sys/net/ppp_deflate.c b/sys/net/ppp_deflate.c
index bc152e83e0cd3..fdc0c64fbd230 100644
--- a/sys/net/ppp_deflate.c
+++ b/sys/net/ppp_deflate.c
@@ -1,4 +1,4 @@
-/*	$Id: ppp_deflate.c,v 1.10 1998/06/20 16:28:03 peter Exp $	*/
+/* $FreeBSD$	*/
 
 /*
  * ppp_deflate.c - interface the zlib procedures for Deflate compression
diff --git a/sys/net/ppp_defs.h b/sys/net/ppp_defs.h
index 5dc126daf8bbc..ac86be268788d 100644
--- a/sys/net/ppp_defs.h
+++ b/sys/net/ppp_defs.h
@@ -24,7 +24,7 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _PPP_DEFS_H_
diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c
index 737c58192edd2..78d427e5d85ae 100644
--- a/sys/net/ppp_tty.c
+++ b/sys/net/ppp_tty.c
@@ -70,7 +70,7 @@
  * Paul Mackerras (paulus@cs.anu.edu.au).
  */
 
-/* $Id: ppp_tty.c,v 1.39 1999/04/27 11:17:07 phk Exp $ */
+/* $FreeBSD$ */
 
 #include "ppp.h"
 #if NPPP > 0
diff --git a/sys/net/radix.c b/sys/net/radix.c
index 30608d849ebb0..55887eb61eb91 100644
--- a/sys/net/radix.c
+++ b/sys/net/radix.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)radix.c	8.4 (Berkeley) 11/2/94
- *	$Id: radix.c,v 1.17 1999/04/29 03:22:16 luoqi Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/net/radix.h b/sys/net/radix.h
index cd18f7a12af8b..f68f67aaecd5f 100644
--- a/sys/net/radix.h
+++ b/sys/net/radix.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)radix.h	8.2 (Berkeley) 10/31/94
- *	$Id: radix.h,v 1.13 1997/10/12 20:25:13 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _RADIX_H_
diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c
index 9cbc31eaa3809..97dbc102f616b 100644
--- a/sys/net/raw_cb.c
+++ b/sys/net/raw_cb.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_cb.c	8.1 (Berkeley) 6/10/93
- *	$Id: raw_cb.c,v 1.14 1997/10/28 15:58:33 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/net/raw_cb.h b/sys/net/raw_cb.h
index 23849ee3bf19f..5184de6f1376a 100644
--- a/sys/net/raw_cb.h
+++ b/sys/net/raw_cb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_cb.h	8.1 (Berkeley) 6/10/93
- * $Id: raw_cb.h,v 1.9 1997/04/27 20:00:58 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_RAW_CB_H_
diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c
index 109c94289deb2..07b316d18041d 100644
--- a/sys/net/raw_usrreq.c
+++ b/sys/net/raw_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_usrreq.c	8.1 (Berkeley) 6/10/93
- *	$Id: raw_usrreq.c,v 1.16 1997/11/07 08:53:18 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/net/route.c b/sys/net/route.c
index b0af484581d3e..eddd18afe9613 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.c	8.2 (Berkeley) 11/15/93
- *	$Id: route.c,v 1.51 1999/01/27 22:42:14 dillon Exp $
+ * $FreeBSD$
  */
 
 #include "opt_inet.h"
diff --git a/sys/net/route.h b/sys/net/route.h
index d37b3ae8fdb20..a30a0f96e1250 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.h	8.3 (Berkeley) 4/19/94
- * $Id: route.h,v 1.29 1999/05/06 18:12:56 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_ROUTE_H_
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 22c7bb5c6cd11..0c02e78a2659a 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)rtsock.c	8.5 (Berkeley) 11/2/94
- *	$Id: rtsock.c,v 1.39 1999/04/28 11:37:38 phk Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/net/slcompress.c b/sys/net/slcompress.c
index afd6bf6e96be2..f878bf55413e8 100644
--- a/sys/net/slcompress.c
+++ b/sys/net/slcompress.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)slcompress.c	8.2 (Berkeley) 4/16/94
- * $Id: slcompress.c,v 1.11 1997/08/19 14:10:47 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/net/slcompress.h b/sys/net/slcompress.h
index 5c273ab02183e..ca7ed031ccfc7 100644
--- a/sys/net/slcompress.h
+++ b/sys/net/slcompress.h
@@ -34,7 +34,7 @@
  *
  *	Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
  *	- Initial distribution.
- * $Id: slcompress.h,v 1.12 1997/08/19 14:10:48 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NET_SLCOMPRESS_H_
diff --git a/sys/net/slip.h b/sys/net/slip.h
index e7889e2ec7bd0..917ebf0865b43 100644
--- a/sys/net/slip.h
+++ b/sys/net/slip.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)slip.h	8.1 (Berkeley) 2/12/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NET_SLIP_H_
diff --git a/sys/net/zlib.c b/sys/net/zlib.c
index 687e3801eb9f0..64c4ad0eaf6a5 100644
--- a/sys/net/zlib.c
+++ b/sys/net/zlib.c
@@ -10,7 +10,7 @@
  * - added inflateIncomp and deflateOutputPending
  * - allow strm->next_out to be NULL, meaning discard the output
  *
- * $Id: zlib.c,v 1.7 1998/06/20 16:28:04 peter Exp $
+ * $FreeBSD$
  */
 
 /* 
diff --git a/sys/net/zlib.h b/sys/net/zlib.h
index b9499cb72549b..1f3ee5049f10d 100644
--- a/sys/net/zlib.h
+++ b/sys/net/zlib.h
@@ -1,4 +1,4 @@
-/*	$Id: zlib.h,v 1.4 1998/03/21 20:56:16 peter Exp $	*/
+/* $FreeBSD$	*/
 
 /*
  * This file is derived from zlib.h and zconf.h from the zlib-1.0.4
diff --git a/sys/netatm/atm.h b/sys/netatm/atm.h
index 46dfb8626a8ec..1145a9c462f83 100644
--- a/sys/netatm/atm.h
+++ b/sys/netatm/atm.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm.h,v 1.8 1998/07/30 22:30:43 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/atm_aal5.c b/sys/netatm/atm_aal5.c
index 7d6a22bd792bc..2cf70c9e3cad8 100644
--- a/sys/netatm/atm_aal5.c
+++ b/sys/netatm/atm_aal5.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_aal5.c,v 1.3 1998/10/31 20:06:54 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -39,7 +39,7 @@
 #include <sys/stat.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: atm_aal5.c,v 1.3 1998/10/31 20:06:54 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/atm_cm.c b/sys/netatm/atm_cm.c
index d2ab8b5d8ecbd..e5bf21120bb80 100644
--- a/sys/netatm/atm_cm.c
+++ b/sys/netatm/atm_cm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_cm.c,v 1.4 1999/01/27 22:16:15 dillon Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <netatm/kern_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: atm_cm.c,v 1.4 1999/01/27 22:16:15 dillon Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/atm_cm.h b/sys/netatm/atm_cm.h
index 9e000ab9e5625..0507caa8fcfa9 100644
--- a/sys/netatm/atm_cm.h
+++ b/sys/netatm/atm_cm.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_cm.h,v 1.3 1998/03/24 20:41:40 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/atm_device.c b/sys/netatm/atm_device.c
index d68134fc03fe8..9c645a590dc1f 100644
--- a/sys/netatm/atm_device.c
+++ b/sys/netatm/atm_device.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_device.c,v 1.3 1998/10/31 20:06:54 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <netatm/kern_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: atm_device.c,v 1.3 1998/10/31 20:06:54 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/atm_if.c b/sys/netatm/atm_if.c
index b4f9ce6e117b4..1825eaf0b413a 100644
--- a/sys/netatm/atm_if.c
+++ b/sys/netatm/atm_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_if.c,v 1.3 1998/12/04 22:54:52 archie Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <netatm/kern_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: atm_if.c,v 1.3 1998/12/04 22:54:52 archie Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/atm_if.h b/sys/netatm/atm_if.h
index ccf9d035d2112..d2ea47180c32a 100644
--- a/sys/netatm/atm_if.h
+++ b/sys/netatm/atm_if.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_if.h,v 1.13 1998/08/07 22:10:37 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/atm_ioctl.h b/sys/netatm/atm_ioctl.h
index 898557cceda5d..547432058435b 100644
--- a/sys/netatm/atm_ioctl.h
+++ b/sys/netatm/atm_ioctl.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_ioctl.h,v 1.1 1998/09/15 08:22:58 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/atm_pcb.h b/sys/netatm/atm_pcb.h
index 12ac5d042fc82..b5518e8079ac3 100644
--- a/sys/netatm/atm_pcb.h
+++ b/sys/netatm/atm_pcb.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_pcb.h,v 1.2 1998/07/30 22:30:51 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/atm_proto.c b/sys/netatm/atm_proto.c
index 5327e4ed923ac..a75024a94c200 100644
--- a/sys/netatm/atm_proto.c
+++ b/sys/netatm/atm_proto.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_proto.c,v 1.1 1998/09/15 08:22:58 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <netatm/kern_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: atm_proto.c,v 1.1 1998/09/15 08:22:58 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/atm_sap.h b/sys/netatm/atm_sap.h
index 1386516a95dae..35f54351c4f53 100644
--- a/sys/netatm/atm_sap.h
+++ b/sys/netatm/atm_sap.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_sap.h,v 1.3 1998/02/19 19:59:38 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/atm_sigmgr.h b/sys/netatm/atm_sigmgr.h
index 1b9388e6543cd..bd502a32424e3 100644
--- a/sys/netatm/atm_sigmgr.h
+++ b/sys/netatm/atm_sigmgr.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_sigmgr.h,v 1.7 1998/03/24 20:43:59 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/atm_signal.c b/sys/netatm/atm_signal.c
index 11660d5d50812..2ad3b54178f54 100644
--- a/sys/netatm/atm_signal.c
+++ b/sys/netatm/atm_signal.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_signal.c,v 1.2 1998/10/31 20:06:54 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <netatm/kern_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: atm_signal.c,v 1.2 1998/10/31 20:06:54 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/atm_socket.c b/sys/netatm/atm_socket.c
index 004fba4949d0e..2976ff17ceae7 100644
--- a/sys/netatm/atm_socket.c
+++ b/sys/netatm/atm_socket.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_socket.c,v 1.2 1998/10/31 20:06:54 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <netatm/kern_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: atm_socket.c,v 1.2 1998/10/31 20:06:54 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/atm_stack.h b/sys/netatm/atm_stack.h
index abd32c47fdfdb..be7edc8518217 100644
--- a/sys/netatm/atm_stack.h
+++ b/sys/netatm/atm_stack.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_stack.h,v 1.5 1998/02/19 19:59:59 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/atm_subr.c b/sys/netatm/atm_subr.c
index 261ea109ad2e5..507f4f1e0babc 100644
--- a/sys/netatm/atm_subr.c
+++ b/sys/netatm/atm_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_subr.c,v 1.3 1998/10/31 20:06:54 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <netatm/kern_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: atm_subr.c,v 1.3 1998/10/31 20:06:54 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/atm_sys.h b/sys/netatm/atm_sys.h
index d6e9745272d65..0c240bfceef8d 100644
--- a/sys/netatm/atm_sys.h
+++ b/sys/netatm/atm_sys.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_sys.h,v 1.1 1998/09/15 08:22:59 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/atm_usrreq.c b/sys/netatm/atm_usrreq.c
index 2dd968e6b6cd7..f88cf0d203f20 100644
--- a/sys/netatm/atm_usrreq.c
+++ b/sys/netatm/atm_usrreq.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_usrreq.c,v 1.4 1999/01/27 22:42:20 dillon Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <netatm/kern_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: atm_usrreq.c,v 1.4 1999/01/27 22:42:20 dillon Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/atm_var.h b/sys/netatm/atm_var.h
index ab5f8565b39c1..d19a475bd33d8 100644
--- a/sys/netatm/atm_var.h
+++ b/sys/netatm/atm_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_var.h,v 1.9 1998/05/18 19:05:52 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/atm_vc.h b/sys/netatm/atm_vc.h
index 1c7c7b0ad2f0e..64d1b6f39a9de 100644
--- a/sys/netatm/atm_vc.h
+++ b/sys/netatm/atm_vc.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: atm_vc.h,v 1.6 1998/02/19 20:00:34 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/ipatm/ipatm.h b/sys/netatm/ipatm/ipatm.h
index b3ce348a285fe..887509c0fee82 100644
--- a/sys/netatm/ipatm/ipatm.h
+++ b/sys/netatm/ipatm/ipatm.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: ipatm.h,v 1.5 1998/03/24 20:49:49 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/ipatm/ipatm_event.c b/sys/netatm/ipatm/ipatm_event.c
index 66f736e6bbd00..0566d1cfd3b2d 100644
--- a/sys/netatm/ipatm/ipatm_event.c
+++ b/sys/netatm/ipatm/ipatm_event.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: ipatm_event.c,v 1.2 1998/09/17 09:35:00 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/ipatm/ipatm_serv.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: ipatm_event.c,v 1.2 1998/09/17 09:35:00 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/ipatm/ipatm_if.c b/sys/netatm/ipatm/ipatm_if.c
index 7cac3da4e319c..eeb3c00659e66 100644
--- a/sys/netatm/ipatm/ipatm_if.c
+++ b/sys/netatm/ipatm/ipatm_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: ipatm_if.c,v 1.1 1998/09/15 08:23:00 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/ipatm/ipatm_serv.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: ipatm_if.c,v 1.1 1998/09/15 08:23:00 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/ipatm/ipatm_input.c b/sys/netatm/ipatm/ipatm_input.c
index 5d292fe2c9061..e3049cfb63ddd 100644
--- a/sys/netatm/ipatm/ipatm_input.c
+++ b/sys/netatm/ipatm/ipatm_input.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: ipatm_input.c,v 1.1 1998/09/15 08:23:00 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/ipatm/ipatm_serv.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: ipatm_input.c,v 1.1 1998/09/15 08:23:00 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/ipatm/ipatm_load.c b/sys/netatm/ipatm/ipatm_load.c
index edb251e14b782..29e9837687c41 100644
--- a/sys/netatm/ipatm/ipatm_load.c
+++ b/sys/netatm/ipatm/ipatm_load.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: ipatm_load.c,v 1.3 1999/01/27 22:42:20 dillon Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -46,7 +46,7 @@
 #include <netatm/ipatm/ipatm_serv.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: ipatm_load.c,v 1.3 1999/01/27 22:42:20 dillon Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/ipatm/ipatm_output.c b/sys/netatm/ipatm/ipatm_output.c
index 54def8a1e5062..c7a1933d8dd2e 100644
--- a/sys/netatm/ipatm/ipatm_output.c
+++ b/sys/netatm/ipatm/ipatm_output.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: ipatm_output.c,v 1.1 1998/09/15 08:23:01 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/ipatm/ipatm_serv.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: ipatm_output.c,v 1.1 1998/09/15 08:23:01 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/ipatm/ipatm_serv.h b/sys/netatm/ipatm/ipatm_serv.h
index 20462137968f9..a807b0672357b 100644
--- a/sys/netatm/ipatm/ipatm_serv.h
+++ b/sys/netatm/ipatm/ipatm_serv.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: ipatm_serv.h,v 1.6 1998/02/19 20:14:21 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/ipatm/ipatm_usrreq.c b/sys/netatm/ipatm/ipatm_usrreq.c
index 6fc94d6feb76e..d10f7c743ee81 100644
--- a/sys/netatm/ipatm/ipatm_usrreq.c
+++ b/sys/netatm/ipatm/ipatm_usrreq.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: ipatm_usrreq.c,v 1.2 1998/10/31 20:06:55 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/ipatm/ipatm_serv.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: ipatm_usrreq.c,v 1.2 1998/10/31 20:06:55 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/ipatm/ipatm_var.h b/sys/netatm/ipatm/ipatm_var.h
index 6048284b4d753..b587a6e0e4cd8 100644
--- a/sys/netatm/ipatm/ipatm_var.h
+++ b/sys/netatm/ipatm/ipatm_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: ipatm_var.h,v 1.8 1998/03/24 20:56:57 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/ipatm/ipatm_vcm.c b/sys/netatm/ipatm/ipatm_vcm.c
index 8bfab7e5e0644..409c3357aa945 100644
--- a/sys/netatm/ipatm/ipatm_vcm.c
+++ b/sys/netatm/ipatm/ipatm_vcm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: ipatm_vcm.c,v 1.2 1998/09/17 09:35:00 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/ipatm/ipatm_serv.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: ipatm_vcm.c,v 1.2 1998/09/17 09:35:00 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/kern_include.h b/sys/netatm/kern_include.h
index 78700db9595f2..36a4071931e2b 100644
--- a/sys/netatm/kern_include.h
+++ b/sys/netatm/kern_include.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: kern_include.h,v 1.1 1998/09/15 08:22:59 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/port.h b/sys/netatm/port.h
index fac693adedf70..d9a0b133c4ec0 100644
--- a/sys/netatm/port.h
+++ b/sys/netatm/port.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: port.h,v 1.7 1998/03/24 20:25:28 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/queue.h b/sys/netatm/queue.h
index 8a8febf5e07e2..67bff75481a88 100644
--- a/sys/netatm/queue.h
+++ b/sys/netatm/queue.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: queue.h,v 1.2 1997/05/06 22:14:38 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/sigpvc/sigpvc.h b/sys/netatm/sigpvc/sigpvc.h
index 893a68255b776..8cc8374b1ee50 100644
--- a/sys/netatm/sigpvc/sigpvc.h
+++ b/sys/netatm/sigpvc/sigpvc.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sigpvc.h,v 1.2 1997/05/06 22:15:43 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/sigpvc/sigpvc_if.c b/sys/netatm/sigpvc/sigpvc_if.c
index 7cdef3f4e9956..bbd7d28d2840d 100644
--- a/sys/netatm/sigpvc/sigpvc_if.c
+++ b/sys/netatm/sigpvc/sigpvc_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sigpvc_if.c,v 1.4 1999/01/19 23:11:39 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -46,7 +46,7 @@
 #include <netatm/sigpvc/sigpvc_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: sigpvc_if.c,v 1.4 1999/01/19 23:11:39 mks Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/sigpvc/sigpvc_subr.c b/sys/netatm/sigpvc/sigpvc_subr.c
index 63e3b64fd5777..adf462b0256fe 100644
--- a/sys/netatm/sigpvc/sigpvc_subr.c
+++ b/sys/netatm/sigpvc/sigpvc_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sigpvc_subr.c,v 1.1 1998/09/15 08:23:02 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -41,7 +41,7 @@
 #include <netatm/sigpvc/sigpvc_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: sigpvc_subr.c,v 1.1 1998/09/15 08:23:02 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 extern struct sp_info sigpvc_vcpool;
diff --git a/sys/netatm/sigpvc/sigpvc_var.h b/sys/netatm/sigpvc/sigpvc_var.h
index 24f92c0f2943e..2cb96bcda2f06 100644
--- a/sys/netatm/sigpvc/sigpvc_var.h
+++ b/sys/netatm/sigpvc/sigpvc_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sigpvc_var.h,v 1.5 1998/02/19 20:16:28 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/spans/spans_arp.c b/sys/netatm/spans/spans_arp.c
index b291e55f8301a..0c445ae7e9f6d 100644
--- a/sys/netatm/spans/spans_arp.c
+++ b/sys/netatm/spans/spans_arp.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_arp.c,v 1.4 1999/01/19 23:11:40 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/spans/spans_cls.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: spans_arp.c,v 1.4 1999/01/19 23:11:40 mks Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/spans/spans_cls.c b/sys/netatm/spans/spans_cls.c
index d4c9c953e99f3..44daad7eda4a4 100644
--- a/sys/netatm/spans/spans_cls.c
+++ b/sys/netatm/spans/spans_cls.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_cls.c,v 1.4 1999/01/27 22:42:22 dillon Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/spans/spans_cls.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: spans_cls.c,v 1.4 1999/01/27 22:42:22 dillon Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/spans/spans_cls.h b/sys/netatm/spans/spans_cls.h
index d2cacaca99e59..02e2f6a12a071 100644
--- a/sys/netatm/spans/spans_cls.h
+++ b/sys/netatm/spans/spans_cls.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_cls.h,v 1.6 1998/05/18 19:11:17 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/spans/spans_if.c b/sys/netatm/spans/spans_if.c
index 12c9a163bbb70..5cdd77872d999 100644
--- a/sys/netatm/spans/spans_if.c
+++ b/sys/netatm/spans/spans_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_if.c,v 1.4 1998/12/04 22:54:53 archie Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -46,7 +46,7 @@
 #include <netatm/spans/spans_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: spans_if.c,v 1.4 1998/12/04 22:54:53 archie Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 /*
diff --git a/sys/netatm/spans/spans_kxdr.c b/sys/netatm/spans/spans_kxdr.c
index 3843341c22416..d2e4ee4aea4c1 100644
--- a/sys/netatm/spans/spans_kxdr.c
+++ b/sys/netatm/spans/spans_kxdr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_kxdr.c,v 1.1 1998/09/15 08:23:03 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -38,7 +38,7 @@
 #include <netatm/kern_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: spans_kxdr.c,v 1.1 1998/09/15 08:23:03 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 /*
diff --git a/sys/netatm/spans/spans_msg.c b/sys/netatm/spans/spans_msg.c
index 486da9ae4745b..09c4c9f3cdbf0 100644
--- a/sys/netatm/spans/spans_msg.c
+++ b/sys/netatm/spans/spans_msg.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_msg.c,v 1.3 1998/10/31 20:06:56 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/spans/spans_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: spans_msg.c,v 1.3 1998/10/31 20:06:56 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 /*
diff --git a/sys/netatm/spans/spans_print.c b/sys/netatm/spans/spans_print.c
index 4068be94c2337..3e280685893ec 100644
--- a/sys/netatm/spans/spans_print.c
+++ b/sys/netatm/spans/spans_print.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_print.c,v 1.4 1998/12/04 22:54:53 archie Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -41,7 +41,7 @@
 #include <netatm/spans/spans_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: spans_print.c,v 1.4 1998/12/04 22:54:53 archie Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 /*
diff --git a/sys/netatm/spans/spans_proto.c b/sys/netatm/spans/spans_proto.c
index 2cd2f72262424..47e4edc82d938 100644
--- a/sys/netatm/spans/spans_proto.c
+++ b/sys/netatm/spans/spans_proto.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_proto.c,v 1.2 1998/09/17 09:35:00 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -41,7 +41,7 @@
 #include <netatm/spans/spans_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: spans_proto.c,v 1.2 1998/09/17 09:35:00 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 /*
diff --git a/sys/netatm/spans/spans_subr.c b/sys/netatm/spans/spans_subr.c
index b2a418c454b5f..a53d31de2263e 100644
--- a/sys/netatm/spans/spans_subr.c
+++ b/sys/netatm/spans/spans_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_subr.c,v 1.2 1998/09/17 09:35:00 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -41,7 +41,7 @@
 #include <netatm/spans/spans_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: spans_subr.c,v 1.2 1998/09/17 09:35:00 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/spans/spans_util.c b/sys/netatm/spans/spans_util.c
index 904f176d2d564..e174e16de6c0c 100644
--- a/sys/netatm/spans/spans_util.c
+++ b/sys/netatm/spans/spans_util.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_util.c,v 1.2 1998/09/17 09:35:01 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -41,7 +41,7 @@
 #include <netatm/spans/spans_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: spans_util.c,v 1.2 1998/09/17 09:35:01 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/spans/spans_var.h b/sys/netatm/spans/spans_var.h
index 8f9ac8a31b56e..f93d1fc5a2d24 100644
--- a/sys/netatm/spans/spans_var.h
+++ b/sys/netatm/spans/spans_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_var.h,v 1.7 1998/04/09 14:24:18 johnc Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/spans/spans_xdr.x b/sys/netatm/spans/spans_xdr.x
index 7e53f5371c024..1f46857d73fb0 100644
--- a/sys/netatm/spans/spans_xdr.x
+++ b/sys/netatm/spans/spans_xdr.x
@@ -23,7 +23,7 @@
 % * Copies of this Software may be made, however, the above copyright
 % * notice must be reproduced on all copies.
 % *
-% *	@(#) $Id: spans_xdr.x,v 1.4 1997/05/06 22:17:36 mks Exp $
+% *	@(#) $FreeBSD$
 % *
 % */
 %
@@ -61,7 +61,7 @@
 % */
 %
 %#ifndef lint
-%static char *RCSid = "@(#) $Id: spans_xdr.x,v 1.4 1997/05/06 22:17:36 mks Exp $";
+%static char *RCSid = "@(#) $FreeBSD$";
 %#endif
 %
 #endif
diff --git a/sys/netatm/uni/q2110_sigaa.c b/sys/netatm/uni/q2110_sigaa.c
index 381356f6c7e81..cdec794f522ff 100644
--- a/sys/netatm/uni/q2110_sigaa.c
+++ b/sys/netatm/uni/q2110_sigaa.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: q2110_sigaa.c,v 1.1 1998/09/15 08:23:05 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: q2110_sigaa.c,v 1.1 1998/09/15 08:23:05 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/q2110_sigcpcs.c b/sys/netatm/uni/q2110_sigcpcs.c
index 7752fd04278e4..6fdf512cfb752 100644
--- a/sys/netatm/uni/q2110_sigcpcs.c
+++ b/sys/netatm/uni/q2110_sigcpcs.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: q2110_sigcpcs.c,v 1.1 1998/09/15 08:23:05 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: q2110_sigcpcs.c,v 1.1 1998/09/15 08:23:05 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/q2110_subr.c b/sys/netatm/uni/q2110_subr.c
index 32f3833aa1342..f1ea3776572db 100644
--- a/sys/netatm/uni/q2110_subr.c
+++ b/sys/netatm/uni/q2110_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: q2110_subr.c,v 1.1 1998/09/15 08:23:05 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: q2110_subr.c,v 1.1 1998/09/15 08:23:05 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/qsaal1_sigaa.c b/sys/netatm/uni/qsaal1_sigaa.c
index 1788794c5b001..579e08bdeb222 100644
--- a/sys/netatm/uni/qsaal1_sigaa.c
+++ b/sys/netatm/uni/qsaal1_sigaa.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: qsaal1_sigaa.c,v 1.1 1998/09/15 08:23:05 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: qsaal1_sigaa.c,v 1.1 1998/09/15 08:23:05 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/qsaal1_sigcpcs.c b/sys/netatm/uni/qsaal1_sigcpcs.c
index 203e483e6a03e..8f579845de149 100644
--- a/sys/netatm/uni/qsaal1_sigcpcs.c
+++ b/sys/netatm/uni/qsaal1_sigcpcs.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: qsaal1_sigcpcs.c,v 1.1 1998/09/15 08:23:05 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: qsaal1_sigcpcs.c,v 1.1 1998/09/15 08:23:05 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/qsaal1_subr.c b/sys/netatm/uni/qsaal1_subr.c
index 9ad2468dc52ac..ee18866be3734 100644
--- a/sys/netatm/uni/qsaal1_subr.c
+++ b/sys/netatm/uni/qsaal1_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: qsaal1_subr.c,v 1.1 1998/09/15 08:23:06 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: qsaal1_subr.c,v 1.1 1998/09/15 08:23:06 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/sscf_uni.c b/sys/netatm/uni/sscf_uni.c
index 9f6824b81abcf..7a8bbaaacd0ae 100644
--- a/sys/netatm/uni/sscf_uni.c
+++ b/sys/netatm/uni/sscf_uni.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscf_uni.c,v 1.4 1998/12/04 22:54:53 archie Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/sscf_uni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: sscf_uni.c,v 1.4 1998/12/04 22:54:53 archie Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/sscf_uni.h b/sys/netatm/uni/sscf_uni.h
index cf244462d5039..e55d6b8e9d304 100644
--- a/sys/netatm/uni/sscf_uni.h
+++ b/sys/netatm/uni/sscf_uni.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscf_uni.h,v 1.2 1997/05/06 22:19:34 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/sscf_uni_lower.c b/sys/netatm/uni/sscf_uni_lower.c
index 56db85fd7de94..c1690667d522b 100644
--- a/sys/netatm/uni/sscf_uni_lower.c
+++ b/sys/netatm/uni/sscf_uni_lower.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscf_uni_lower.c,v 1.2 1998/09/17 09:35:01 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/sscf_uni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: sscf_uni_lower.c,v 1.2 1998/09/17 09:35:01 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/sscf_uni_upper.c b/sys/netatm/uni/sscf_uni_upper.c
index 24a41f555be3e..df0ea2565df16 100644
--- a/sys/netatm/uni/sscf_uni_upper.c
+++ b/sys/netatm/uni/sscf_uni_upper.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscf_uni_upper.c,v 1.2 1998/09/17 09:35:01 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/sscf_uni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: sscf_uni_upper.c,v 1.2 1998/09/17 09:35:01 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/sscf_uni_var.h b/sys/netatm/uni/sscf_uni_var.h
index ffed7ded64478..f8b70aacaf76f 100644
--- a/sys/netatm/uni/sscf_uni_var.h
+++ b/sys/netatm/uni/sscf_uni_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscf_uni_var.h,v 1.5 1998/02/19 20:22:05 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/sscop.c b/sys/netatm/uni/sscop.c
index b4fb6e25671d9..ad50d3d25219f 100644
--- a/sys/netatm/uni/sscop.c
+++ b/sys/netatm/uni/sscop.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscop.c,v 1.3 1998/10/31 20:07:00 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: sscop.c,v 1.3 1998/10/31 20:07:00 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/sscop.h b/sys/netatm/uni/sscop.h
index 2f786b3be8fdd..89ca468bcc37f 100644
--- a/sys/netatm/uni/sscop.h
+++ b/sys/netatm/uni/sscop.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscop.h,v 1.4 1998/08/26 23:29:19 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/sscop_lower.c b/sys/netatm/uni/sscop_lower.c
index 3810f91123fd2..393a39413e5f5 100644
--- a/sys/netatm/uni/sscop_lower.c
+++ b/sys/netatm/uni/sscop_lower.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscop_lower.c,v 1.2 1998/09/17 09:35:01 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: sscop_lower.c,v 1.2 1998/09/17 09:35:01 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/sscop_misc.h b/sys/netatm/uni/sscop_misc.h
index 4348cef90015a..5fcea10bcc0f4 100644
--- a/sys/netatm/uni/sscop_misc.h
+++ b/sys/netatm/uni/sscop_misc.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscop_misc.h,v 1.4 1998/08/26 23:29:19 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/sscop_pdu.c b/sys/netatm/uni/sscop_pdu.c
index 03562841d8caa..5fd4c07bb9af7 100644
--- a/sys/netatm/uni/sscop_pdu.c
+++ b/sys/netatm/uni/sscop_pdu.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscop_pdu.c,v 1.2 1998/10/31 20:07:00 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: sscop_pdu.c,v 1.2 1998/10/31 20:07:00 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 /*
diff --git a/sys/netatm/uni/sscop_pdu.h b/sys/netatm/uni/sscop_pdu.h
index 387a6028606c4..9a930d0feaff7 100644
--- a/sys/netatm/uni/sscop_pdu.h
+++ b/sys/netatm/uni/sscop_pdu.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscop_pdu.h,v 1.3 1997/05/06 22:20:15 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/sscop_sigaa.c b/sys/netatm/uni/sscop_sigaa.c
index 6753982161398..5e91d7cde51fc 100644
--- a/sys/netatm/uni/sscop_sigaa.c
+++ b/sys/netatm/uni/sscop_sigaa.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscop_sigaa.c,v 1.1 1998/09/15 08:23:07 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: sscop_sigaa.c,v 1.1 1998/09/15 08:23:07 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/sscop_sigcpcs.c b/sys/netatm/uni/sscop_sigcpcs.c
index 6b1c477bbb01d..9223bb2cfec0e 100644
--- a/sys/netatm/uni/sscop_sigcpcs.c
+++ b/sys/netatm/uni/sscop_sigcpcs.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscop_sigcpcs.c,v 1.1 1998/09/15 08:23:08 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: sscop_sigcpcs.c,v 1.1 1998/09/15 08:23:08 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/sscop_subr.c b/sys/netatm/uni/sscop_subr.c
index 44d0808aa09bc..1a70d3bc033ea 100644
--- a/sys/netatm/uni/sscop_subr.c
+++ b/sys/netatm/uni/sscop_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscop_subr.c,v 1.3 1998/10/31 20:07:00 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: sscop_subr.c,v 1.3 1998/10/31 20:07:00 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/sscop_timer.c b/sys/netatm/uni/sscop_timer.c
index e6b1b906d7f23..42a98fb072154 100644
--- a/sys/netatm/uni/sscop_timer.c
+++ b/sys/netatm/uni/sscop_timer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscop_timer.c,v 1.3 1998/10/31 20:07:00 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: sscop_timer.c,v 1.3 1998/10/31 20:07:00 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/sscop_upper.c b/sys/netatm/uni/sscop_upper.c
index f2ad1bd95c5e9..5f345fc61a511 100644
--- a/sys/netatm/uni/sscop_upper.c
+++ b/sys/netatm/uni/sscop_upper.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscop_upper.c,v 1.2 1998/09/17 09:35:01 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/sscop_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: sscop_upper.c,v 1.2 1998/09/17 09:35:01 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/sscop_var.h b/sys/netatm/uni/sscop_var.h
index 9a739d39090ca..f29108a40d0b1 100644
--- a/sys/netatm/uni/sscop_var.h
+++ b/sys/netatm/uni/sscop_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: sscop_var.h,v 1.6 1998/04/07 23:21:57 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/uni.h b/sys/netatm/uni/uni.h
index 700e859ca6848..b7cd1bd48b4a6 100644
--- a/sys/netatm/uni/uni.h
+++ b/sys/netatm/uni/uni.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: uni.h,v 1.2 1997/05/06 22:20:39 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/uni_load.c b/sys/netatm/uni/uni_load.c
index 7be1eba01a0c2..bd51a4774b067 100644
--- a/sys/netatm/uni/uni_load.c
+++ b/sys/netatm/uni/uni_load.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: uni_load.c,v 1.1 1998/09/15 08:23:09 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/uni.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: uni_load.c,v 1.1 1998/09/15 08:23:09 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 /*
diff --git a/sys/netatm/uni/uniarp.c b/sys/netatm/uni/uniarp.c
index 48140996665f6..7c23a01b473ce 100644
--- a/sys/netatm/uni/uniarp.c
+++ b/sys/netatm/uni/uniarp.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: uniarp.c,v 1.5 1999/01/19 23:16:11 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/uniip_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: uniarp.c,v 1.5 1999/01/19 23:16:11 mks Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/uniarp_cache.c b/sys/netatm/uni/uniarp_cache.c
index 88a26a59c76b5..6e08e57db388a 100644
--- a/sys/netatm/uni/uniarp_cache.c
+++ b/sys/netatm/uni/uniarp_cache.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: uniarp_cache.c,v 1.2 1998/10/31 20:07:00 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/uniip_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: uniarp_cache.c,v 1.2 1998/10/31 20:07:00 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/uniarp_input.c b/sys/netatm/uni/uniarp_input.c
index 80920292226f4..afa9927a58baa 100644
--- a/sys/netatm/uni/uniarp_input.c
+++ b/sys/netatm/uni/uniarp_input.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: uniarp_input.c,v 1.3 1998/12/04 22:54:53 archie Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/uniip_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: uniarp_input.c,v 1.3 1998/12/04 22:54:53 archie Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/uniarp_output.c b/sys/netatm/uni/uniarp_output.c
index 4f7a16388d09e..f8cd594caac11 100644
--- a/sys/netatm/uni/uniarp_output.c
+++ b/sys/netatm/uni/uniarp_output.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: uniarp_output.c,v 1.1 1998/09/15 08:23:09 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/uni/uniip_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: uniarp_output.c,v 1.1 1998/09/15 08:23:09 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/uniarp_timer.c b/sys/netatm/uni/uniarp_timer.c
index b65ca568cdd8e..2b550ad9d3427 100644
--- a/sys/netatm/uni/uniarp_timer.c
+++ b/sys/netatm/uni/uniarp_timer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: uniarp_timer.c,v 1.1 1998/09/15 08:23:10 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/uniip_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: uniarp_timer.c,v 1.1 1998/09/15 08:23:10 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/uniarp_vcm.c b/sys/netatm/uni/uniarp_vcm.c
index e2e9c2d289737..95e20e2785d28 100644
--- a/sys/netatm/uni/uniarp_vcm.c
+++ b/sys/netatm/uni/uniarp_vcm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: uniarp_vcm.c,v 1.2 1998/09/17 09:35:02 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/uniip_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: uniarp_vcm.c,v 1.2 1998/09/17 09:35:02 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/uniip.c b/sys/netatm/uni/uniip.c
index 88e79a0204872..c0a40854bfd94 100644
--- a/sys/netatm/uni/uniip.c
+++ b/sys/netatm/uni/uniip.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: uniip.c,v 1.2 1998/10/31 20:07:00 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/uni/uniip_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: uniip.c,v 1.2 1998/10/31 20:07:00 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/uniip_var.h b/sys/netatm/uni/uniip_var.h
index ea1eb8c98cd3d..409d2ad6de0f4 100644
--- a/sys/netatm/uni/uniip_var.h
+++ b/sys/netatm/uni/uniip_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: uniip_var.h,v 1.9 1998/07/13 00:00:39 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/unisig.h b/sys/netatm/uni/unisig.h
index b69714d2c25ae..1f06f5ccffc13 100644
--- a/sys/netatm/uni/unisig.h
+++ b/sys/netatm/uni/unisig.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig.h,v 1.2 1997/05/06 22:21:33 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/unisig_decode.c b/sys/netatm/uni/unisig_decode.c
index 08fe4b728a7c4..6cd9bde21412a 100644
--- a/sys/netatm/uni/unisig_decode.c
+++ b/sys/netatm/uni/unisig_decode.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_decode.c,v 1.2 1998/09/17 09:35:02 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/unisig_decode.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: unisig_decode.c,v 1.2 1998/09/17 09:35:02 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 #define	ALLOC_IE(ie)						\
diff --git a/sys/netatm/uni/unisig_decode.h b/sys/netatm/uni/unisig_decode.h
index dbd184aedee96..3a181f06abd7a 100644
--- a/sys/netatm/uni/unisig_decode.h
+++ b/sys/netatm/uni/unisig_decode.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_decode.h,v 1.5 1998/08/26 23:29:21 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/unisig_encode.c b/sys/netatm/uni/unisig_encode.c
index 34a039aec1596..9789ae94fa7c6 100644
--- a/sys/netatm/uni/unisig_encode.c
+++ b/sys/netatm/uni/unisig_encode.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_encode.c,v 1.2 1998/09/17 09:35:02 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/unisig_decode.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: unisig_encode.c,v 1.2 1998/09/17 09:35:02 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/unisig_if.c b/sys/netatm/uni/unisig_if.c
index 33bfb488dc831..08dad264ae36c 100644
--- a/sys/netatm/uni/unisig_if.c
+++ b/sys/netatm/uni/unisig_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_if.c,v 1.5 1998/12/11 21:47:46 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -47,7 +47,7 @@
 #include <netatm/uni/unisig_msg.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: unisig_if.c,v 1.5 1998/12/11 21:47:46 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/unisig_mbuf.c b/sys/netatm/uni/unisig_mbuf.c
index c7f00912c9e35..af6d47821a7c2 100644
--- a/sys/netatm/uni/unisig_mbuf.c
+++ b/sys/netatm/uni/unisig_mbuf.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_mbuf.c,v 1.3 1998/10/31 20:07:01 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/uni/unisig_msg.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: unisig_mbuf.c,v 1.3 1998/10/31 20:07:01 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/unisig_mbuf.h b/sys/netatm/uni/unisig_mbuf.h
index f394047eeb35a..986ae43ab5cba 100644
--- a/sys/netatm/uni/unisig_mbuf.h
+++ b/sys/netatm/uni/unisig_mbuf.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_mbuf.h,v 1.5 1998/08/26 23:29:22 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/unisig_msg.c b/sys/netatm/uni/unisig_msg.c
index f52f46e8f446c..7d4125883832c 100644
--- a/sys/netatm/uni/unisig_msg.c
+++ b/sys/netatm/uni/unisig_msg.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_msg.c,v 1.3 1998/10/31 20:07:01 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/unisig_print.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: unisig_msg.c,v 1.3 1998/10/31 20:07:01 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/unisig_msg.h b/sys/netatm/uni/unisig_msg.h
index 1305bc77e0ded..9ea3c4db924f0 100644
--- a/sys/netatm/uni/unisig_msg.h
+++ b/sys/netatm/uni/unisig_msg.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_msg.h,v 1.1 1998/09/15 08:23:11 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/unisig_print.c b/sys/netatm/uni/unisig_print.c
index 93133cad3d6e1..174b7518902fc 100644
--- a/sys/netatm/uni/unisig_print.c
+++ b/sys/netatm/uni/unisig_print.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_print.c,v 1.1 1998/09/15 08:23:12 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/unisig_print.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: unisig_print.c,v 1.1 1998/09/15 08:23:12 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/unisig_print.h b/sys/netatm/uni/unisig_print.h
index 5e906c8284a7f..22f440a06abc3 100644
--- a/sys/netatm/uni/unisig_print.h
+++ b/sys/netatm/uni/unisig_print.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_print.h,v 1.2 1997/05/06 22:22:27 mks Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/unisig_proto.c b/sys/netatm/uni/unisig_proto.c
index 8a3daac6753a8..39aa8b0e44a69 100644
--- a/sys/netatm/uni/unisig_proto.c
+++ b/sys/netatm/uni/unisig_proto.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_proto.c,v 1.2 1998/09/17 09:35:02 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -43,7 +43,7 @@
 #include <netatm/uni/unisig_mbuf.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: unisig_proto.c,v 1.2 1998/09/17 09:35:02 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/unisig_sigmgr_state.c b/sys/netatm/uni/unisig_sigmgr_state.c
index e2213bf2ec6ac..b4360c9a5f212 100644
--- a/sys/netatm/uni/unisig_sigmgr_state.c
+++ b/sys/netatm/uni/unisig_sigmgr_state.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_sigmgr_state.c,v 1.3 1998/10/31 20:07:01 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -47,7 +47,7 @@
 #include <netatm/uni/sscf_uni.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: unisig_sigmgr_state.c,v 1.3 1998/10/31 20:07:01 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/unisig_subr.c b/sys/netatm/uni/unisig_subr.c
index 888cedcf99ab5..124784a5eae88 100644
--- a/sys/netatm/uni/unisig_subr.c
+++ b/sys/netatm/uni/unisig_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_subr.c,v 1.4 1998/10/31 20:08:03 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/uni/unisig_msg.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: unisig_subr.c,v 1.4 1998/10/31 20:08:03 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/unisig_util.c b/sys/netatm/uni/unisig_util.c
index a3a2ab2ba3cbf..5243628dd0b29 100644
--- a/sys/netatm/uni/unisig_util.c
+++ b/sys/netatm/uni/unisig_util.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_util.c,v 1.3 1998/10/31 20:07:01 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/uni/unisig_msg.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: unisig_util.c,v 1.3 1998/10/31 20:07:01 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netatm/uni/unisig_var.h b/sys/netatm/uni/unisig_var.h
index b8d422930250a..ca7e7faf56d50 100644
--- a/sys/netatm/uni/unisig_var.h
+++ b/sys/netatm/uni/unisig_var.h
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_var.h,v 1.1 1998/09/15 08:23:13 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
diff --git a/sys/netatm/uni/unisig_vc_state.c b/sys/netatm/uni/unisig_vc_state.c
index 84f995e9cf31b..b6775095d730c 100644
--- a/sys/netatm/uni/unisig_vc_state.c
+++ b/sys/netatm/uni/unisig_vc_state.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: unisig_vc_state.c,v 1.3 1998/10/31 20:07:01 phk Exp $
+ *	@(#) $FreeBSD$
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/uni/unisig_decode.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: unisig_vc_state.c,v 1.3 1998/10/31 20:07:01 phk Exp $");
+__RCSID("@(#) $FreeBSD$");
 #endif
 
 
diff --git a/sys/netinet/fil.c b/sys/netinet/fil.c
index f91ee3dec08bd..ee0ff9096f382 100644
--- a/sys/netinet/fil.c
+++ b/sys/netinet/fil.c
@@ -7,7 +7,7 @@
  */
 #if !defined(lint)
 static const char sccsid[] = "@(#)fil.c	1.36 6/5/96 (C) 1993-1996 Darren Reed";
-static const char rcsid[] = "@(#)$Id: fil.c,v 1.3 1998/06/20 18:37:49 peter Exp $";
+static const char rcsid[] = "@(#)$FreeBSD$";
 #endif
 
 #include "opt_ipfilter.h"
@@ -1098,7 +1098,7 @@ nodata:
  * SUCH DAMAGE.
  *
  *	@(#)uipc_mbuf.c	8.2 (Berkeley) 1/4/94
- * $Id: fil.c,v 1.3 1998/06/20 18:37:49 peter Exp $
+ * $FreeBSD$
  */
 /*
  * Copy data from an mbuf chain starting "off" bytes from the beginning,
diff --git a/sys/netinet/icmp_var.h b/sys/netinet/icmp_var.h
index c19cc3540cc19..02d147c31331c 100644
--- a/sys/netinet/icmp_var.h
+++ b/sys/netinet/icmp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)icmp_var.h	8.1 (Berkeley) 6/10/93
- * $Id: icmp_var.h,v 1.12 1998/12/04 04:21:25 dillon Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_ICMP_VAR_H_
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index 9b7e4156a30a7..197f7a0f421e7 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ether.c	8.1 (Berkeley) 6/10/93
- * $Id: if_ether.c,v 1.57 1999/04/15 17:58:24 eivind Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/netinet/if_ether.h b/sys/netinet/if_ether.h
index 3540119748c57..79f1252781c7f 100644
--- a/sys/netinet/if_ether.h
+++ b/sys/netinet/if_ether.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ether.h	8.3 (Berkeley) 5/2/95
- *	$Id: if_ether.h,v 1.20 1997/02/22 09:41:25 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IF_ETHER_H_
diff --git a/sys/netinet/if_fddi.h b/sys/netinet/if_fddi.h
index 336ff4768cd6e..fc6acc6c9c8fc 100644
--- a/sys/netinet/if_fddi.h
+++ b/sys/netinet/if_fddi.h
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_fddi.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IF_FDDI_H_
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index c1c90c0416428..83cc650c21a56 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp.c	8.1 (Berkeley) 7/19/93
- * $Id: igmp.c,v 1.26 1998/12/12 21:45:49 dillon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/netinet/igmp.h b/sys/netinet/igmp.h
index 01d6d09179775..7d943d6eb5482 100644
--- a/sys/netinet/igmp.h
+++ b/sys/netinet/igmp.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp.h	8.1 (Berkeley) 6/10/93
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IGMP_H_
diff --git a/sys/netinet/igmp_var.h b/sys/netinet/igmp_var.h
index 84485e328f99b..0dd330fb19e0c 100644
--- a/sys/netinet/igmp_var.h
+++ b/sys/netinet/igmp_var.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)igmp_var.h	8.1 (Berkeley) 7/19/93
- *	$Id: igmp_var.h,v 1.13 1999/02/16 10:49:51 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IGMP_VAR_H_
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index 0c78b995ebbce..4562672f1e6c1 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in.c	8.4 (Berkeley) 1/9/95
- *	$Id: in.c,v 1.40 1999/04/24 12:28:51 luigi Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/in.h b/sys/netinet/in.h
index 1838defb6f6bf..ba5d24f91ad48 100644
--- a/sys/netinet/in.h
+++ b/sys/netinet/in.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in.h	8.3 (Berkeley) 1/3/94
- * $Id: in.h,v 1.42 1999/05/08 14:28:52 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IN_H_
diff --git a/sys/netinet/in_cksum.c b/sys/netinet/in_cksum.c
index 5da488f6594d9..eaf14935070a9 100644
--- a/sys/netinet/in_cksum.c
+++ b/sys/netinet/in_cksum.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_cksum.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/in_hostcache.c b/sys/netinet/in_hostcache.c
index a3f08b6db1d95..33e0187565fa5 100644
--- a/sys/netinet/in_hostcache.c
+++ b/sys/netinet/in_hostcache.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: in_hostcache.c,v 1.1 1997/06/18 01:24:28 wollman Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/in_hostcache.h b/sys/netinet/in_hostcache.h
index 81ae4bdb99e6d..98e8fd433ecbd 100644
--- a/sys/netinet/in_hostcache.h
+++ b/sys/netinet/in_hostcache.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IN_HOSTCACHE_H
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index bc48c3bd31b1d..162eaa3922560 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_pcb.c	8.4 (Berkeley) 5/24/95
- *	$Id: in_pcb.c,v 1.51 1999/06/25 23:46:47 pb Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index 33d8d7a73dcf2..0912fea898ea8 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_pcb.h	8.1 (Berkeley) 6/10/93
- * $Id: in_pcb.h,v 1.26 1998/05/15 20:11:33 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IN_PCB_H_
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index 083d10bd686f0..786b4e8c7669d 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_proto.c	8.2 (Berkeley) 2/9/95
- *	$Id: in_proto.c,v 1.47 1998/08/23 03:07:14 wollman Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ipdivert.h"
diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c
index 98f86c6410a17..52d062dd7830a 100644
--- a/sys/netinet/in_rmx.c
+++ b/sys/netinet/in_rmx.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: in_rmx.c,v 1.35 1998/08/05 16:59:20 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/netinet/in_systm.h b/sys/netinet/in_systm.h
index aa6f0d719ca6a..5d18c56e71758 100644
--- a/sys/netinet/in_systm.h
+++ b/sys/netinet/in_systm.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_systm.h	8.1 (Berkeley) 6/10/93
- * $Id: in_systm.h,v 1.6 1998/06/07 17:12:14 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IN_SYSTM_H_
diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h
index 5fd0a09f08ccc..9569f48f59a14 100644
--- a/sys/netinet/in_var.h
+++ b/sys/netinet/in_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_var.h	8.2 (Berkeley) 1/9/95
- *	$Id: in_var.h,v 1.29 1998/06/07 17:12:14 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IN_VAR_H_
diff --git a/sys/netinet/ip.h b/sys/netinet/ip.h
index c5e916bbf36b0..0b6f1b6361d52 100644
--- a/sys/netinet/ip.h
+++ b/sys/netinet/ip.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip.h	8.2 (Berkeley) 6/1/94
- *	$Id: ip.h,v 1.14 1998/02/26 08:31:52 dima Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IP_H_
diff --git a/sys/netinet/ip_auth.c b/sys/netinet/ip_auth.c
index dab93b0ef0c2f..4afda70b809d2 100644
--- a/sys/netinet/ip_auth.c
+++ b/sys/netinet/ip_auth.c
@@ -6,7 +6,7 @@
  * to the original author and the contributors.
  */
 #if !defined(lint)
-static const char rcsid[] = "@(#)$Id: ip_auth.c,v 1.5 1998/08/15 21:51:53 bde Exp $";
+static const char rcsid[] = "@(#)$FreeBSD$";
 #endif
 
 #if defined(KERNEL) && !defined(_KERNEL)
diff --git a/sys/netinet/ip_auth.h b/sys/netinet/ip_auth.h
index 267c217434273..72e51b22ae1c8 100644
--- a/sys/netinet/ip_auth.h
+++ b/sys/netinet/ip_auth.h
@@ -5,7 +5,7 @@
  * provided that this notice is preserved and due credit is given
  * to the original author and the contributors.
  *
- * $Id: ip_auth.h,v 1.1.1.1 1997/11/16 05:55:52 peter Exp $
+ * $FreeBSD$
  *
  */
 #ifndef	__IP_AUTH_H__
diff --git a/sys/netinet/ip_compat.h b/sys/netinet/ip_compat.h
index 1f91cf3c949bd..e3fd1fee5f853 100644
--- a/sys/netinet/ip_compat.h
+++ b/sys/netinet/ip_compat.h
@@ -6,7 +6,7 @@
  * to the original author and the contributors.
  *
  * @(#)ip_compat.h	1.8 1/14/96
- * $Id: ip_compat.h,v 2.0.2.31.2.11 1998/05/23 14:29:36 darrenr Exp $
+ * $FreeBSD$
  */
 
 #ifndef	__IP_COMPAT_H__
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index e4b82b9423848..32a13f20f8963 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ip_divert.c,v 1.37 1999/02/08 05:53:39 julian Exp $
+ * $FreeBSD$
  */
 
 #include "opt_inet.h"
diff --git a/sys/netinet/ip_dummynet.c b/sys/netinet/ip_dummynet.c
index 5bd6a3d057ac1..66d9e532737c5 100644
--- a/sys/netinet/ip_dummynet.c
+++ b/sys/netinet/ip_dummynet.c
@@ -10,7 +10,7 @@
  *
  * This software is provided ``AS IS'' without any warranties of any kind.
  *
- *	$Id: ip_dummynet.c,v 1.16 1999/08/11 14:37:58 luigi Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/netinet/ip_dummynet.h b/sys/netinet/ip_dummynet.h
index 98eae8206156e..55d9614006b18 100644
--- a/sys/netinet/ip_dummynet.h
+++ b/sys/netinet/ip_dummynet.h
@@ -10,7 +10,7 @@
  *
  * This software is provided ``AS IS'' without any warranties of any kind.
  *
- *	$Id: ip_dummynet.h,v 1.4 1999/04/20 13:32:04 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _IP_DUMMYNET_H
diff --git a/sys/netinet/ip_fil.c b/sys/netinet/ip_fil.c
index 6cbdac90533c5..2dbea5dbf8ac6 100644
--- a/sys/netinet/ip_fil.c
+++ b/sys/netinet/ip_fil.c
@@ -7,7 +7,7 @@
  */
 #if !defined(lint)
 static const char sccsid[] = "@(#)ip_fil.c	2.41 6/5/96 (C) 1993-1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ip_fil.c,v 1.6 1998/08/15 21:51:53 bde Exp $";
+static const char rcsid[] = "@(#)$FreeBSD$";
 #endif
 
 #include "opt_ipfilter.h"
diff --git a/sys/netinet/ip_fil.h b/sys/netinet/ip_fil.h
index e40ef555ae92b..79f68964cbc92 100644
--- a/sys/netinet/ip_fil.h
+++ b/sys/netinet/ip_fil.h
@@ -6,7 +6,7 @@
  * to the original author and the contributors.
  *
  * @(#)ip_fil.h	1.35 6/5/96
- * $Id: ip_fil.h,v 1.5 1998/06/08 09:47:41 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef	__IP_FIL_H__
diff --git a/sys/netinet/ip_flow.c b/sys/netinet/ip_flow.c
index fdebdb0b03eaf..6c9119b5ee866 100644
--- a/sys/netinet/ip_flow.c
+++ b/sys/netinet/ip_flow.c
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: ip_flow.c,v 1.7 1999/04/11 02:50:42 eivind Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/ip_flow.h b/sys/netinet/ip_flow.h
index 4ba163018338c..4675996cc7905 100644
--- a/sys/netinet/ip_flow.h
+++ b/sys/netinet/ip_flow.h
@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IP_FLOW_H
diff --git a/sys/netinet/ip_frag.c b/sys/netinet/ip_frag.c
index 7ad47f784b089..de104e55452b5 100644
--- a/sys/netinet/ip_frag.c
+++ b/sys/netinet/ip_frag.c
@@ -7,7 +7,7 @@
  */
 #if !defined(lint)
 static const char sccsid[] = "@(#)ip_frag.c	1.11 3/24/96 (C) 1993-1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ip_frag.c,v 1.2 1998/03/21 11:34:06 peter Exp $";
+static const char rcsid[] = "@(#)$FreeBSD$";
 #endif
 
 #if !defined(_KERNEL) && defined(KERNEL)
diff --git a/sys/netinet/ip_frag.h b/sys/netinet/ip_frag.h
index 9122f17a51157..c50905042fa16 100644
--- a/sys/netinet/ip_frag.h
+++ b/sys/netinet/ip_frag.h
@@ -6,7 +6,7 @@
  * to the original author and the contributors.
  *
  * @(#)ip_frag.h	1.5 3/24/96
- * $Id: ip_frag.h,v 2.0.2.12.2.1 1998/05/23 14:29:39 darrenr Exp $
+ * $FreeBSD$
  */
 
 #ifndef	__IP_FRAG_H__
diff --git a/sys/netinet/ip_ftp_pxy.c b/sys/netinet/ip_ftp_pxy.c
index 7e37d96753710..917dbb2bf1f94 100644
--- a/sys/netinet/ip_ftp_pxy.c
+++ b/sys/netinet/ip_ftp_pxy.c
@@ -2,7 +2,7 @@
  * Simple FTP transparent proxy for in-kernel use.  For use with the NAT
  * code.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #define	isdigit(x)	((x) >= '0' && (x) <= '9')
diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c
index f32bff2a2589a..49e03c3709ca2 100644
--- a/sys/netinet/ip_fw.c
+++ b/sys/netinet/ip_fw.c
@@ -12,7 +12,7 @@
  *
  * This software is provided ``AS IS'' without any warranties of any kind.
  *
- *	$Id: ip_fw.c,v 1.118 1999/08/21 18:35:50 green Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/netinet/ip_fw.h b/sys/netinet/ip_fw.h
index c14a96b81e9aa..07ac1bb8fb6d1 100644
--- a/sys/netinet/ip_fw.h
+++ b/sys/netinet/ip_fw.h
@@ -11,7 +11,7 @@
  *
  * This software is provided ``AS IS'' without any warranties of any kind.
  *
- *	$Id: ip_fw.h,v 1.41 1999/08/11 15:34:46 luigi Exp $
+ * $FreeBSD$
  */
 
 #ifndef _IP_FW_H
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index 5a5abc4689e34..6bb234b4da164 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_icmp.c	8.2 (Berkeley) 1/4/94
- *	$Id: ip_icmp.c,v 1.34 1999/03/06 23:10:42 archie Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/ip_icmp.h b/sys/netinet/ip_icmp.h
index af2f787b029ce..4dd6c9750d7c8 100644
--- a/sys/netinet/ip_icmp.h
+++ b/sys/netinet/ip_icmp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_icmp.h	8.1 (Berkeley) 6/10/93
- * $Id: ip_icmp.h,v 1.11 1997/02/22 09:41:34 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IP_ICMP_H_
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 55b7132a0e34b..6cf40de7ab1ff 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_input.c	8.2 (Berkeley) 1/4/94
- *	$Id: ip_input.c,v 1.119 1999/05/04 16:20:32 luigi Exp $
+ * $FreeBSD$
  */
 
 #define	_IP_VHL
diff --git a/sys/netinet/ip_log.c b/sys/netinet/ip_log.c
index 8a826ed2985cc..3f73a3e21fb68 100644
--- a/sys/netinet/ip_log.c
+++ b/sys/netinet/ip_log.c
@@ -5,7 +5,7 @@
  * provided that this notice is preserved and due credit is given
  * to the original author and the contributors.
  *
- * $Id: ip_log.c,v 1.5 1998/11/26 18:54:52 eivind Exp $
+ * $FreeBSD$
  */
 #include "opt_ipfilter.h"
 
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index bf63c7694af6e..20aa381e97c63 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -9,7 +9,7 @@
  * Modified by Bill Fenner, PARC, April 1995
  *
  * MROUTING Revision: 3.5
- * $Id: ip_mroute.c,v 1.53 1999/01/18 02:06:57 fenner Exp $
+ * $FreeBSD$
  */
 
 #include "opt_mrouting.h"
diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h
index 0526bbb18f751..abccedaa02a97 100644
--- a/sys/netinet/ip_mroute.h
+++ b/sys/netinet/ip_mroute.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_mroute.h	8.1 (Berkeley) 6/10/93
- * $Id: ip_mroute.h,v 1.14 1998/08/23 03:07:14 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IP_MROUTE_H_
diff --git a/sys/netinet/ip_nat.c b/sys/netinet/ip_nat.c
index 243c8bb191446..a8f8744f51494 100644
--- a/sys/netinet/ip_nat.c
+++ b/sys/netinet/ip_nat.c
@@ -9,7 +9,7 @@
  */
 #if !defined(lint)
 static const char sccsid[] = "@(#)ip_nat.c	1.11 6/5/96 (C) 1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ip_nat.c,v 1.4 1998/08/15 21:51:53 bde Exp $";
+static const char rcsid[] = "@(#)$FreeBSD$";
 #endif
 
 #include "opt_ipfilter.h"
diff --git a/sys/netinet/ip_nat.h b/sys/netinet/ip_nat.h
index 65ab99dd9ed91..d02a84457774d 100644
--- a/sys/netinet/ip_nat.h
+++ b/sys/netinet/ip_nat.h
@@ -6,7 +6,7 @@
  * to the original author and the contributors.
  *
  * @(#)ip_nat.h	1.5 2/4/96
- * $Id: ip_nat.h,v 1.1.1.5 1998/06/20 18:17:53 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef	__IP_NAT_H__
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index e0d8de36f37e7..32200c1e11861 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_output.c	8.3 (Berkeley) 1/21/94
- *	$Id: ip_output.c,v 1.89 1999/05/04 09:26:12 luigi Exp $
+ * $FreeBSD$
  */
 
 #define _IP_VHL
diff --git a/sys/netinet/ip_proxy.c b/sys/netinet/ip_proxy.c
index 31764298d50b5..e604051aa5480 100644
--- a/sys/netinet/ip_proxy.c
+++ b/sys/netinet/ip_proxy.c
@@ -6,7 +6,7 @@
  * to the original author and the contributors.
  */
 #if !defined(lint)
-static const char rcsid[] = "@(#)$Id: ip_proxy.c,v 1.3 1998/06/20 18:37:50 peter Exp $";
+static const char rcsid[] = "@(#)$FreeBSD$";
 #endif
 
 #if defined(__FreeBSD__) && defined(KERNEL) && !defined(_KERNEL)
diff --git a/sys/netinet/ip_proxy.h b/sys/netinet/ip_proxy.h
index a361e9368adaf..cd7e9f9a671aa 100644
--- a/sys/netinet/ip_proxy.h
+++ b/sys/netinet/ip_proxy.h
@@ -5,7 +5,7 @@
  * provided that this notice is preserved and due credit is given
  * to the original author and the contributors.
  *
- * $Id: ip_proxy.h,v 2.0.2.10.2.1 1997/11/27 09:33:27 darrenr Exp $
+ * $FreeBSD$
  */
 
 #ifndef	__IP_PROXY_H__
diff --git a/sys/netinet/ip_state.c b/sys/netinet/ip_state.c
index b6a8054961351..d5a36375b3997 100644
--- a/sys/netinet/ip_state.c
+++ b/sys/netinet/ip_state.c
@@ -7,7 +7,7 @@
  */
 #if !defined(lint)
 static const char sccsid[] = "@(#)ip_state.c	1.8 6/5/96 (C) 1993-1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ip_state.c,v 1.4 1998/11/26 18:54:52 eivind Exp $";
+static const char rcsid[] = "@(#)$FreeBSD$";
 #endif
 
 #include "opt_ipfilter.h"
diff --git a/sys/netinet/ip_state.h b/sys/netinet/ip_state.h
index f2ae94bb7020d..2b7e8989de4d2 100644
--- a/sys/netinet/ip_state.h
+++ b/sys/netinet/ip_state.h
@@ -6,7 +6,7 @@
  * to the original author and the contributors.
  *
  * @(#)ip_state.h	1.3 1/12/96 (C) 1995 Darren Reed
- * $Id: ip_state.h,v 2.0.2.14.2.6 1998/05/24 05:18:04 darrenr Exp $
+ * $FreeBSD$
  */
 #ifndef	__IP_STATE_H__
 #define	__IP_STATE_H__
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index 1de266497f28b..08b3a06d33047 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_var.h	8.2 (Berkeley) 1/9/95
- *	$Id: ip_var.h,v 1.44 1998/08/23 03:07:14 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_IP_VAR_H_
diff --git a/sys/netinet/ipl.h b/sys/netinet/ipl.h
index d1608d54ecbb6..0985545e110c7 100644
--- a/sys/netinet/ipl.h
+++ b/sys/netinet/ipl.h
@@ -6,7 +6,7 @@
  * to the original author and the contributors.
  *
  * @(#)ipl.h	1.21 6/5/96
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	__IPL_H__
diff --git a/sys/netinet/mlf_ipl.c b/sys/netinet/mlf_ipl.c
index 39249a5d1de6b..74d9ab063939b 100644
--- a/sys/netinet/mlf_ipl.c
+++ b/sys/netinet/mlf_ipl.c
@@ -5,7 +5,7 @@
  * provided that this notice is preserved and due credit is given
  * to the original author and the contributors.
  *
- * $Id$
+ * $FreeBSD$
  */
 /*
  * 29/12/94 Added code from Marc Huber <huber@fzi.de> to allow it to allocate
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index d8117dde0ac38..e153cc17cf12f 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)raw_ip.c	8.7 (Berkeley) 5/15/95
- *	$Id: raw_ip.c,v 1.59 1999/05/03 23:57:30 billf Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h
index 89624e30e2787..268b54e272c1c 100644
--- a/sys/netinet/tcp.h
+++ b/sys/netinet/tcp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp.h	8.1 (Berkeley) 6/10/93
- * $Id: tcp.h,v 1.9 1998/06/08 09:47:42 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_TCP_H_
diff --git a/sys/netinet/tcp_debug.c b/sys/netinet/tcp_debug.c
index c82049e559fad..a01607dac3ec9 100644
--- a/sys/netinet/tcp_debug.c
+++ b/sys/netinet/tcp_debug.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_debug.c	8.1 (Berkeley) 6/10/93
- * $Id: tcp_debug.c,v 1.12 1998/01/08 23:41:53 eivind Exp $
+ * $FreeBSD$
  */
 
 #include "opt_inet.h"
diff --git a/sys/netinet/tcp_debug.h b/sys/netinet/tcp_debug.h
index a33743b0779ef..c359cb4034b17 100644
--- a/sys/netinet/tcp_debug.h
+++ b/sys/netinet/tcp_debug.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_debug.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_TCP_DEBUG_H_
diff --git a/sys/netinet/tcp_fsm.h b/sys/netinet/tcp_fsm.h
index 4a535564dc360..2af6e2b6d0e4f 100644
--- a/sys/netinet/tcp_fsm.h
+++ b/sys/netinet/tcp_fsm.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_fsm.h	8.1 (Berkeley) 6/10/93
- * $Id: tcp_fsm.h,v 1.10 1997/08/16 19:15:38 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_TCP_FSM_H_
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index e0236b063f817..94813ea6914f7 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_input.c	8.12 (Berkeley) 5/24/95
- *	$Id: tcp_input.c,v 1.89 1999/08/18 15:40:05 csgr Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ipfw.h"		/* for ipfw_fwd		*/
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 6303221e82b76..0fbceb897a327 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_output.c	8.4 (Berkeley) 5/24/95
- *	$Id: tcp_output.c,v 1.33 1999/04/07 22:22:06 julian Exp $
+ * $FreeBSD$
  */
 
 #include "opt_tcpdebug.h"
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c
index e0236b063f817..94813ea6914f7 100644
--- a/sys/netinet/tcp_reass.c
+++ b/sys/netinet/tcp_reass.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_input.c	8.12 (Berkeley) 5/24/95
- *	$Id: tcp_input.c,v 1.89 1999/08/18 15:40:05 csgr Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ipfw.h"		/* for ipfw_fwd		*/
diff --git a/sys/netinet/tcp_seq.h b/sys/netinet/tcp_seq.h
index 8cccf199e10ba..0ad0fb838be17 100644
--- a/sys/netinet/tcp_seq.h
+++ b/sys/netinet/tcp_seq.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_seq.h	8.3 (Berkeley) 6/21/95
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_TCP_SEQ_H_
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index f5c5b10aa4124..3320b079dd524 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_subr.c	8.2 (Berkeley) 5/24/95
- *	$Id: tcp_subr.c,v 1.57 1999/07/11 18:32:45 green Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index 00746a5b33d2f..de7ecc92734a8 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_timer.c	8.2 (Berkeley) 5/24/95
- *	$Id: tcp_timer.c,v 1.28 1998/04/24 09:25:35 dg Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/netinet/tcp_timer.h b/sys/netinet/tcp_timer.h
index a2fcb7721257a..3c0f39e47a4d7 100644
--- a/sys/netinet/tcp_timer.h
+++ b/sys/netinet/tcp_timer.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_timer.h	8.1 (Berkeley) 6/10/93
- *	$Id: tcp_timer.h,v 1.12 1997/02/22 09:41:42 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_TCP_TIMER_H_
diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c
index f5c5b10aa4124..3320b079dd524 100644
--- a/sys/netinet/tcp_timewait.c
+++ b/sys/netinet/tcp_timewait.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_subr.c	8.2 (Berkeley) 5/24/95
- *	$Id: tcp_subr.c,v 1.57 1999/07/11 18:32:45 green Exp $
+ * $FreeBSD$
  */
 
 #include "opt_compat.h"
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index b6d4ae8a59119..231da99d6a1ab 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)tcp_usrreq.c	8.2 (Berkeley) 1/3/94
- *	$Id: tcp_usrreq.c,v 1.43 1999/05/03 23:57:32 billf Exp $
+ * $FreeBSD$
  */
 
 #include "opt_tcpdebug.h"
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index e2c448a3cea4b..eadd4f5b7cfd1 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_var.h	8.4 (Berkeley) 5/24/95
- * 	$Id: tcp_var.h,v 1.49 1999/01/20 17:32:00 fenner Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_TCP_VAR_H_
diff --git a/sys/netinet/tcpip.h b/sys/netinet/tcpip.h
index ba2e0f28d8d8a..2cf3df1d3ba69 100644
--- a/sys/netinet/tcpip.h
+++ b/sys/netinet/tcpip.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcpip.h	8.1 (Berkeley) 6/10/93
- * $Id: tcpip.h,v 1.6 1997/02/22 09:41:43 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_TCPIP_H_
diff --git a/sys/netinet/udp.h b/sys/netinet/udp.h
index e73e1f4ddbbbc..635267f065a15 100644
--- a/sys/netinet/udp.h
+++ b/sys/netinet/udp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_UDP_H_
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index f086ad8b331d1..337e796ad07ac 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp_usrreq.c	8.6 (Berkeley) 5/23/95
- *	$Id: udp_usrreq.c,v 1.54 1999/08/17 12:17:53 csgr Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h
index 4784a35089447..5ede8a6a3d43b 100644
--- a/sys/netinet/udp_var.h
+++ b/sys/netinet/udp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)udp_var.h	8.1 (Berkeley) 6/10/93
- * $Id: udp_var.h,v 1.17 1999/02/16 10:49:52 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETINET_UDP_VAR_H_
diff --git a/sys/netipx/ipx.c b/sys/netipx/ipx.c
index f23759c506410..5035256f5618d 100644
--- a/sys/netipx/ipx.c
+++ b/sys/netipx/ipx.c
@@ -33,7 +33,7 @@
  * 
  *	@(#)ipx.c
  *
- * $Id: ipx.c,v 1.15 1998/12/09 13:48:08 eivind Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netipx/ipx.h b/sys/netipx/ipx.h
index f92657338f893..3bcf5f0b24bcb 100644
--- a/sys/netipx/ipx.h
+++ b/sys/netipx/ipx.h
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx.h
  *
- * $Id: ipx.h,v 1.12 1997/05/10 09:58:49 jhay Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETIPX_IPX_H_
diff --git a/sys/netipx/ipx_cksum.c b/sys/netipx/ipx_cksum.c
index 497c05a564edb..4bb9124f0f330 100644
--- a/sys/netipx/ipx_cksum.c
+++ b/sys/netipx/ipx_cksum.c
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_cksum.c
  *
- * $Id: ipx_cksum.c,v 1.6 1997/05/10 09:58:50 jhay Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netipx/ipx_if.h b/sys/netipx/ipx_if.h
index c4f1864422a42..c6ec19e0ded05 100644
--- a/sys/netipx/ipx_if.h
+++ b/sys/netipx/ipx_if.h
@@ -33,7 +33,7 @@
  * 
  *	@(#)ipx_if.h
  *
- * $Id: ipx_if.h,v 1.8 1997/05/10 09:58:51 jhay Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETIPX_IPX_IF_H_
diff --git a/sys/netipx/ipx_input.c b/sys/netipx/ipx_input.c
index 38b2b3c34d2f8..44634b31a4d02 100644
--- a/sys/netipx/ipx_input.c
+++ b/sys/netipx/ipx_input.c
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_input.c
  *
- * $Id: ipx_input.c,v 1.17 1998/04/06 09:30:42 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netipx/ipx_ip.c b/sys/netipx/ipx_ip.c
index 5b8b8aa0cf17a..4f5721f00feff 100644
--- a/sys/netipx/ipx_ip.c
+++ b/sys/netipx/ipx_ip.c
@@ -33,7 +33,7 @@
  * 
  *	@(#)ipx_ip.c
  *
- * $Id: ipx_ip.c,v 1.21 1998/06/07 17:12:19 dfr Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/netipx/ipx_ip.h b/sys/netipx/ipx_ip.h
index e8bd9cf80f036..0543df5dab29d 100644
--- a/sys/netipx/ipx_ip.h
+++ b/sys/netipx/ipx_ip.h
@@ -33,7 +33,7 @@
  *
  *	@(#)ipxip.h
  *
- * $Id: ipx_ip.h,v 1.11 1997/06/26 19:35:50 jhay Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETIPX_IPXIP_H_
diff --git a/sys/netipx/ipx_outputfl.c b/sys/netipx/ipx_outputfl.c
index e732c33b83ee8..fb5c2fbbcaa16 100644
--- a/sys/netipx/ipx_outputfl.c
+++ b/sys/netipx/ipx_outputfl.c
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_outputfl.c
  *
- * $Id: ipx_outputfl.c,v 1.11 1999/02/06 10:48:10 jhay Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netipx/ipx_pcb.c b/sys/netipx/ipx_pcb.c
index 7a55c878a59f2..6b57bdc2cab65 100644
--- a/sys/netipx/ipx_pcb.c
+++ b/sys/netipx/ipx_pcb.c
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_pcb.c
  *
- * $Id: ipx_pcb.c,v 1.15 1999/02/06 10:48:10 jhay Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netipx/ipx_pcb.h b/sys/netipx/ipx_pcb.h
index 3f03602dcfc86..586f26305560f 100644
--- a/sys/netipx/ipx_pcb.h
+++ b/sys/netipx/ipx_pcb.h
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_pcb.h
  *
- * $Id: ipx_pcb.h,v 1.11 1997/06/26 19:35:54 jhay Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETIPX_IPX_PCB_H_
diff --git a/sys/netipx/ipx_proto.c b/sys/netipx/ipx_proto.c
index f7b8e5947299b..36e2b5334fa31 100644
--- a/sys/netipx/ipx_proto.c
+++ b/sys/netipx/ipx_proto.c
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_proto.c
  *
- * $Id: ipx_proto.c,v 1.13 1998/02/09 06:10:24 eivind Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ipx.h"
diff --git a/sys/netipx/ipx_tun.c b/sys/netipx/ipx_tun.c
index 14afb08465774..f2709eb8c8cf1 100644
--- a/sys/netipx/ipx_tun.c
+++ b/sys/netipx/ipx_tun.c
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_tun.c
  *
- * $Id: ipx_tun.c,v 1.7 1997/03/24 11:33:34 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/netipx/ipx_usrreq.c b/sys/netipx/ipx_usrreq.c
index 8106eccb9c044..2e20f0fb45cda 100644
--- a/sys/netipx/ipx_usrreq.c
+++ b/sys/netipx/ipx_usrreq.c
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_usrreq.c
  *
- * $Id: ipx_usrreq.c,v 1.22 1999/02/06 10:48:11 jhay Exp $
+ * $FreeBSD$
  */
 
 #include "opt_ipx.h"
diff --git a/sys/netipx/ipx_var.h b/sys/netipx/ipx_var.h
index 8d521a0159405..acdafe5adcf61 100644
--- a/sys/netipx/ipx_var.h
+++ b/sys/netipx/ipx_var.h
@@ -33,7 +33,7 @@
  *
  *	@(#)ipx_var.h
  *
- * $Id: ipx_var.h,v 1.11 1998/08/23 03:07:15 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETIPX_IPX_VAR_H_
diff --git a/sys/netipx/spx.h b/sys/netipx/spx.h
index 20a4116c2b15f..6fca28a17d7a9 100644
--- a/sys/netipx/spx.h
+++ b/sys/netipx/spx.h
@@ -33,7 +33,7 @@
  *
  *	@(#)spx.h
  *
- * $Id: spx.h,v 1.13 1997/06/26 19:36:00 jhay Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETIPX_SPX_H_
diff --git a/sys/netipx/spx_debug.c b/sys/netipx/spx_debug.c
index e9b26c385570e..d8e0a6f34f0f9 100644
--- a/sys/netipx/spx_debug.c
+++ b/sys/netipx/spx_debug.c
@@ -33,7 +33,7 @@
  *
  *	@(#)spx_debug.c
  *
- * $Id: spx_debug.c,v 1.12 1998/01/08 23:41:57 eivind Exp $
+ * $FreeBSD$
  */
 
 #include "opt_inet.h"
diff --git a/sys/netipx/spx_debug.h b/sys/netipx/spx_debug.h
index a3f10cb57341b..94f2e2f3bbf92 100644
--- a/sys/netipx/spx_debug.h
+++ b/sys/netipx/spx_debug.h
@@ -33,7 +33,7 @@
  *
  *	@(#)spx_debug.h
  *
- * $Id: spx_debug.h,v 1.9 1997/05/10 09:58:57 jhay Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETIPX_SPX_DEBUG_H_
diff --git a/sys/netipx/spx_timer.h b/sys/netipx/spx_timer.h
index 5fc19d1acb71e..602200975fad4 100644
--- a/sys/netipx/spx_timer.h
+++ b/sys/netipx/spx_timer.h
@@ -33,7 +33,7 @@
  *
  *	@(#)spx_timer.h
  *
- * $Id: spx_timer.h,v 1.8 1997/05/10 09:58:57 jhay Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETIPX_SPX_TIMER_H_
diff --git a/sys/netipx/spx_usrreq.c b/sys/netipx/spx_usrreq.c
index 8a23b0ee047a4..7418eaced6d1a 100644
--- a/sys/netipx/spx_usrreq.c
+++ b/sys/netipx/spx_usrreq.c
@@ -33,7 +33,7 @@
  *
  *	@(#)spx_usrreq.h
  *
- * $Id: spx_usrreq.c,v 1.24 1999/01/28 00:57:51 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netipx/spx_var.h b/sys/netipx/spx_var.h
index ed36a93221642..7dfb783ee89da 100644
--- a/sys/netipx/spx_var.h
+++ b/sys/netipx/spx_var.h
@@ -33,7 +33,7 @@
  *
  *	@(#)spx_var.h
  *
- * $Id: spx_var.h,v 1.7 1997/05/10 09:58:58 jhay Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETIPX_SPX_VAR_H_
diff --git a/sys/netns/idp.h b/sys/netns/idp.h
index 3d624233d179f..e832756597676 100644
--- a/sys/netns/idp.h
+++ b/sys/netns/idp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)idp.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETNS_IDP_H_
diff --git a/sys/netns/idp_usrreq.c b/sys/netns/idp_usrreq.c
index 6ff4b4f62cf15..a03770f02ddb1 100644
--- a/sys/netns/idp_usrreq.c
+++ b/sys/netns/idp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)idp_usrreq.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/idp_var.h b/sys/netns/idp_var.h
index 13bedb726a913..ce43141774045 100644
--- a/sys/netns/idp_var.h
+++ b/sys/netns/idp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)idp_var.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETNS_IDP_VAR_H_
diff --git a/sys/netns/ns.c b/sys/netns/ns.c
index ce58ba1a24f61..7af5acf12ac9c 100644
--- a/sys/netns/ns.c
+++ b/sys/netns/ns.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns.c	8.2 (Berkeley) 11/15/93
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns.h b/sys/netns/ns.h
index 2224534f725d9..a20b868cab61f 100644
--- a/sys/netns/ns.h
+++ b/sys/netns/ns.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETNS_NS_H_
diff --git a/sys/netns/ns_cksum.c b/sys/netns/ns_cksum.c
index 617fb2c0f2eb3..1f9a58aad0969 100644
--- a/sys/netns/ns_cksum.c
+++ b/sys/netns/ns_cksum.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_cksum.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns_error.c b/sys/netns/ns_error.c
index b72f1994abdd9..fc4db94bd69e4 100644
--- a/sys/netns/ns_error.c
+++ b/sys/netns/ns_error.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_error.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns_error.h b/sys/netns/ns_error.h
index d02913e904155..234080130fa73 100644
--- a/sys/netns/ns_error.h
+++ b/sys/netns/ns_error.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_error.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETNS_NS_ERROR_H_
diff --git a/sys/netns/ns_if.h b/sys/netns/ns_if.h
index a44f36581be74..4dfabe7c74942 100644
--- a/sys/netns/ns_if.h
+++ b/sys/netns/ns_if.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_if.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETNS_NS_IF_H_
diff --git a/sys/netns/ns_input.c b/sys/netns/ns_input.c
index 363d787e720b2..21d64a09a8a6f 100644
--- a/sys/netns/ns_input.c
+++ b/sys/netns/ns_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_input.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns_ip.c b/sys/netns/ns_ip.c
index 6eec470fbd78f..0c5fbeb846478 100644
--- a/sys/netns/ns_ip.c
+++ b/sys/netns/ns_ip.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_ip.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/netns/ns_output.c b/sys/netns/ns_output.c
index 8b044896d4ea3..572ed36585fee 100644
--- a/sys/netns/ns_output.c
+++ b/sys/netns/ns_output.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_output.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns_pcb.c b/sys/netns/ns_pcb.c
index 48c8154b1d832..85f7548e68e94 100644
--- a/sys/netns/ns_pcb.c
+++ b/sys/netns/ns_pcb.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_pcb.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/ns_pcb.h b/sys/netns/ns_pcb.h
index 37b85dc9d16a9..8b5646a32cc57 100644
--- a/sys/netns/ns_pcb.h
+++ b/sys/netns/ns_pcb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ns_pcb.h	8.1 (Berkeley) 6/10/93
- * $Id: ns_pcb.h,v 1.8 1997/02/22 09:42:21 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NETNS_NS_PCB_H_
diff --git a/sys/netns/ns_proto.c b/sys/netns/ns_proto.c
index 5abf989df6ed0..1bee0e472814d 100644
--- a/sys/netns/ns_proto.c
+++ b/sys/netns/ns_proto.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)ns_proto.c	8.1 (Berkeley) 6/10/93
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/sp.h b/sys/netns/sp.h
index 97ab3d9835d1b..adef4fd64b318 100644
--- a/sys/netns/sp.h
+++ b/sys/netns/sp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sp.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETNS_SP_H_
diff --git a/sys/netns/spidp.h b/sys/netns/spidp.h
index 02513cdd6216b..3920f672a214d 100644
--- a/sys/netns/spidp.h
+++ b/sys/netns/spidp.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spidp.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETNS_SPIDP_H_
diff --git a/sys/netns/spp_debug.c b/sys/netns/spp_debug.c
index 88adcab67d402..840d93a844c9f 100644
--- a/sys/netns/spp_debug.c
+++ b/sys/netns/spp_debug.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_debug.c	8.1 (Berkeley) 6/10/93
- * $Id: spp_debug.c,v 1.8 1997/02/22 09:42:25 peter Exp $
+ * $FreeBSD$
  */
 
 #include "opt_inet.h"
diff --git a/sys/netns/spp_debug.h b/sys/netns/spp_debug.h
index 6f6e5c2d544c0..db0d71318a52a 100644
--- a/sys/netns/spp_debug.h
+++ b/sys/netns/spp_debug.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_debug.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETNS_SPP_DEBUG_H_
diff --git a/sys/netns/spp_timer.h b/sys/netns/spp_timer.h
index 501c584a58e2e..7501a0cc98896 100644
--- a/sys/netns/spp_timer.h
+++ b/sys/netns/spp_timer.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_timer.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETNS_SPP_TIMER_H_
diff --git a/sys/netns/spp_usrreq.c b/sys/netns/spp_usrreq.c
index 995ae77cb0c49..4ab74ce1e250e 100644
--- a/sys/netns/spp_usrreq.c
+++ b/sys/netns/spp_usrreq.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_usrreq.c	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/netns/spp_var.h b/sys/netns/spp_var.h
index e7c74196f490a..e1d88dee9ec26 100644
--- a/sys/netns/spp_var.h
+++ b/sys/netns/spp_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spp_var.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _NETNS_SPP_VAR_H_
diff --git a/sys/nfs/bootp_subr.c b/sys/nfs/bootp_subr.c
index d91bf90bae356..32952484de43f 100644
--- a/sys/nfs/bootp_subr.c
+++ b/sys/nfs/bootp_subr.c
@@ -1,4 +1,4 @@
-/*	$Id: bootp_subr.c,v 1.18 1998/12/07 21:58:43 archie Exp $	*/
+/* $FreeBSD$	*/
 
 /*
  * Copyright (c) 1995 Gordon Ross, Adam Glass
diff --git a/sys/nfs/krpc.h b/sys/nfs/krpc.h
index 0610e4a367404..6c889b57f77cf 100644
--- a/sys/nfs/krpc.h
+++ b/sys/nfs/krpc.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: krpc.h,v 1.4 1995/12/19 23:07:11 cgd Exp $	*/
-/*	$Id: krpc.h,v 1.4 1997/08/16 19:15:52 wollman Exp $	*/
+/* $FreeBSD$	*/
 
 #include <sys/cdefs.h>
 
diff --git a/sys/nfs/krpc_subr.c b/sys/nfs/krpc_subr.c
index fc232b9b74b9b..2127d46a6d29f 100644
--- a/sys/nfs/krpc_subr.c
+++ b/sys/nfs/krpc_subr.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: krpc_subr.c,v 1.12.4.1 1996/06/07 00:52:26 cgd Exp $	*/
-/*	$Id: krpc_subr.c,v 1.11 1998/08/23 03:07:16 wollman Exp $	*/
+/* $FreeBSD$	*/
 
 /*
  * Copyright (c) 1995 Gordon Ross, Adam Glass
diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h
index 6fd3a89efdaf9..c0cd18fae7768 100644
--- a/sys/nfs/nfs.h
+++ b/sys/nfs/nfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.46 1999/05/02 23:56:23 alc Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NFS_NFS_H_
diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c
index 9d93fed1f9fe9..1dad3c43512cf 100644
--- a/sys/nfs/nfs_bio.c
+++ b/sys/nfs/nfs_bio.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_bio.c	8.9 (Berkeley) 3/30/95
- * $Id: nfs_bio.c,v 1.75 1999/08/12 18:04:39 dt Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index 9ffb490e1cfb0..d42c5ac645d93 100644
--- a/sys/nfs/nfs_common.c
+++ b/sys/nfs/nfs_common.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.80 1999/08/08 18:42:55 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/nfs/nfs_common.h b/sys/nfs/nfs_common.h
index 8533d529231d1..b13c0099b816c 100644
--- a/sys/nfs/nfs_common.h
+++ b/sys/nfs/nfs_common.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $Id: nfsm_subs.h,v 1.25 1999/08/04 14:41:39 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfs/nfs_node.c b/sys/nfs/nfs_node.c
index 77ebecbb3551a..13ff9b2902a01 100644
--- a/sys/nfs/nfs_node.c
+++ b/sys/nfs/nfs_node.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_node.c	8.6 (Berkeley) 5/22/95
- * $Id: nfs_node.c,v 1.30 1999/06/15 23:24:14 mjacob Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfs/nfs_nqlease.c b/sys/nfs/nfs_nqlease.c
index 2542ee73f1295..32b5d3971b0cc 100644
--- a/sys/nfs/nfs_nqlease.c
+++ b/sys/nfs/nfs_nqlease.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_nqlease.c	8.9 (Berkeley) 5/20/95
- * $Id: nfs_nqlease.c,v 1.42 1999/06/05 05:34:58 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c
index b5ee411d946b9..a8ce893d85258 100644
--- a/sys/nfs/nfs_serv.c
+++ b/sys/nfs/nfs_serv.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_serv.c  8.8 (Berkeley) 7/31/95
- * $Id: nfs_serv.c,v 1.82 1999/07/28 08:20:49 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c
index 8949d7a32fd80..0059c5119ec15 100644
--- a/sys/nfs/nfs_socket.c
+++ b/sys/nfs/nfs_socket.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_socket.c	8.5 (Berkeley) 3/30/95
- * $Id: nfs_socket.c,v 1.52 1999/05/02 23:56:25 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/nfs/nfs_srvcache.c b/sys/nfs/nfs_srvcache.c
index b5adf4a74bd95..b866cbe678131 100644
--- a/sys/nfs/nfs_srvcache.c
+++ b/sys/nfs/nfs_srvcache.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_srvcache.c	8.3 (Berkeley) 3/30/95
- * $Id: nfs_srvcache.c,v 1.16 1998/02/09 06:10:36 eivind Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index 9ffb490e1cfb0..d42c5ac645d93 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.80 1999/08/08 18:42:55 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c
index 004bdd2d966e5..210dde6c5ccae 100644
--- a/sys/nfs/nfs_syscalls.c
+++ b/sys/nfs/nfs_syscalls.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_syscalls.c	8.5 (Berkeley) 3/30/95
- * $Id: nfs_syscalls.c,v 1.49 1999/04/27 11:17:52 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c
index 89fe668f85634..3e90bdb58a891 100644
--- a/sys/nfs/nfs_vfsops.c
+++ b/sys/nfs/nfs_vfsops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vfsops.c	8.12 (Berkeley) 5/20/95
- * $Id: nfs_vfsops.c,v 1.83 1999/04/10 18:53:29 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 0600c26dd178e..f7250cc55c0fa 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vnops.c	8.16 (Berkeley) 5/27/95
- * $Id: nfs_vnops.c,v 1.138 1999/07/31 01:51:58 msmith Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfs/nfsdiskless.h b/sys/nfs/nfsdiskless.h
index f499a2c4baead..487e0bf65226f 100644
--- a/sys/nfs/nfsdiskless.h
+++ b/sys/nfs/nfsdiskless.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsdiskless.h	8.2 (Berkeley) 3/30/95
- * $Id: nfsdiskless.h,v 1.9 1997/05/12 19:02:55 tegge Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfs/nfsm_subs.h b/sys/nfs/nfsm_subs.h
index 8533d529231d1..b13c0099b816c 100644
--- a/sys/nfs/nfsm_subs.h
+++ b/sys/nfs/nfsm_subs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $Id: nfsm_subs.h,v 1.25 1999/08/04 14:41:39 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfs/nfsmount.h b/sys/nfs/nfsmount.h
index ecb4f058d52a1..77ac7e329464f 100644
--- a/sys/nfs/nfsmount.h
+++ b/sys/nfs/nfsmount.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsmount.h	8.3 (Berkeley) 3/30/95
- * $Id: nfsmount.h,v 1.14 1998/05/19 07:11:27 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfs/nfsnode.h b/sys/nfs/nfsnode.h
index 49adeb21e5c7d..3bc818ff2594a 100644
--- a/sys/nfs/nfsnode.h
+++ b/sys/nfs/nfsnode.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsnode.h	8.9 (Berkeley) 5/14/95
- * $Id: nfsnode.h,v 1.27 1998/11/13 02:39:09 msmith Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfs/nfsproto.h b/sys/nfs/nfsproto.h
index 665a187dd3b1e..cbb2832704bd2 100644
--- a/sys/nfs/nfsproto.h
+++ b/sys/nfs/nfsproto.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsproto.h  8.2 (Berkeley) 3/30/95
- * $Id: nfsproto.h,v 1.5 1998/05/31 19:00:19 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NFS_NFSPROTO_H_
diff --git a/sys/nfs/nfsrtt.h b/sys/nfs/nfsrtt.h
index dd7ffae677192..4473086330152 100644
--- a/sys/nfs/nfsrtt.h
+++ b/sys/nfs/nfsrtt.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsrtt.h	8.2 (Berkeley) 3/30/95
- * $Id: nfsrtt.h,v 1.8 1997/06/03 17:22:47 dfr Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfs/nfsrvcache.h b/sys/nfs/nfsrvcache.h
index a05ab31b2c301..eec5850bd3814 100644
--- a/sys/nfs/nfsrvcache.h
+++ b/sys/nfs/nfsrvcache.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsrvcache.h	8.3 (Berkeley) 3/30/95
- * $Id: nfsrvcache.h,v 1.10 1998/02/03 22:15:04 bde Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfs/nfsv2.h b/sys/nfs/nfsv2.h
index 6e5f2c55a22f3..6f8f85e00d44f 100644
--- a/sys/nfs/nfsv2.h
+++ b/sys/nfs/nfsv2.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsv2.h	8.1 (Berkeley) 6/10/93
- * $Id: nfsv2.h,v 1.7 1997/02/22 09:42:52 peter Exp $
+ * $FreeBSD$
  */
 
 #include <nfs/nfsproto.h>
diff --git a/sys/nfs/nqnfs.h b/sys/nfs/nqnfs.h
index 59f64d5477700..2ba78aead0f44 100644
--- a/sys/nfs/nqnfs.h
+++ b/sys/nfs/nqnfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nqnfs.h	8.3 (Berkeley) 3/30/95
- * $Id: nqnfs.h,v 1.17 1998/06/01 07:23:26 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfs/rpcv2.h b/sys/nfs/rpcv2.h
index 00afefed9542c..525df093a42d9 100644
--- a/sys/nfs/rpcv2.h
+++ b/sys/nfs/rpcv2.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)rpcv2.h	8.2 (Berkeley) 3/30/95
- * $Id: rpcv2.h,v 1.8 1997/05/11 18:05:39 tegge Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfs/xdr_subs.h b/sys/nfs/xdr_subs.h
index bb60dd0aaa2be..82ee38ad491b2 100644
--- a/sys/nfs/xdr_subs.h
+++ b/sys/nfs/xdr_subs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)xdr_subs.h	8.3 (Berkeley) 3/30/95
- * $Id: xdr_subs.h,v 1.11 1999/06/05 05:35:03 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfsclient/bootp_subr.c b/sys/nfsclient/bootp_subr.c
index d91bf90bae356..32952484de43f 100644
--- a/sys/nfsclient/bootp_subr.c
+++ b/sys/nfsclient/bootp_subr.c
@@ -1,4 +1,4 @@
-/*	$Id: bootp_subr.c,v 1.18 1998/12/07 21:58:43 archie Exp $	*/
+/* $FreeBSD$	*/
 
 /*
  * Copyright (c) 1995 Gordon Ross, Adam Glass
diff --git a/sys/nfsclient/krpc.h b/sys/nfsclient/krpc.h
index 0610e4a367404..6c889b57f77cf 100644
--- a/sys/nfsclient/krpc.h
+++ b/sys/nfsclient/krpc.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: krpc.h,v 1.4 1995/12/19 23:07:11 cgd Exp $	*/
-/*	$Id: krpc.h,v 1.4 1997/08/16 19:15:52 wollman Exp $	*/
+/* $FreeBSD$	*/
 
 #include <sys/cdefs.h>
 
diff --git a/sys/nfsclient/krpc_subr.c b/sys/nfsclient/krpc_subr.c
index fc232b9b74b9b..2127d46a6d29f 100644
--- a/sys/nfsclient/krpc_subr.c
+++ b/sys/nfsclient/krpc_subr.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: krpc_subr.c,v 1.12.4.1 1996/06/07 00:52:26 cgd Exp $	*/
-/*	$Id: krpc_subr.c,v 1.11 1998/08/23 03:07:16 wollman Exp $	*/
+/* $FreeBSD$	*/
 
 /*
  * Copyright (c) 1995 Gordon Ross, Adam Glass
diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h
index 6fd3a89efdaf9..c0cd18fae7768 100644
--- a/sys/nfsclient/nfs.h
+++ b/sys/nfsclient/nfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.46 1999/05/02 23:56:23 alc Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NFS_NFS_H_
diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c
index 9d93fed1f9fe9..1dad3c43512cf 100644
--- a/sys/nfsclient/nfs_bio.c
+++ b/sys/nfsclient/nfs_bio.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_bio.c	8.9 (Berkeley) 3/30/95
- * $Id: nfs_bio.c,v 1.75 1999/08/12 18:04:39 dt Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfsclient/nfs_nfsiod.c b/sys/nfsclient/nfs_nfsiod.c
index 004bdd2d966e5..210dde6c5ccae 100644
--- a/sys/nfsclient/nfs_nfsiod.c
+++ b/sys/nfsclient/nfs_nfsiod.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_syscalls.c	8.5 (Berkeley) 3/30/95
- * $Id: nfs_syscalls.c,v 1.49 1999/04/27 11:17:52 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/nfsclient/nfs_node.c b/sys/nfsclient/nfs_node.c
index 77ebecbb3551a..13ff9b2902a01 100644
--- a/sys/nfsclient/nfs_node.c
+++ b/sys/nfsclient/nfs_node.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_node.c	8.6 (Berkeley) 5/22/95
- * $Id: nfs_node.c,v 1.30 1999/06/15 23:24:14 mjacob Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c
index 8949d7a32fd80..0059c5119ec15 100644
--- a/sys/nfsclient/nfs_socket.c
+++ b/sys/nfsclient/nfs_socket.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_socket.c	8.5 (Berkeley) 3/30/95
- * $Id: nfs_socket.c,v 1.52 1999/05/02 23:56:25 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index 9ffb490e1cfb0..d42c5ac645d93 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.80 1999/08/08 18:42:55 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c
index 89fe668f85634..3e90bdb58a891 100644
--- a/sys/nfsclient/nfs_vfsops.c
+++ b/sys/nfsclient/nfs_vfsops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vfsops.c	8.12 (Berkeley) 5/20/95
- * $Id: nfs_vfsops.c,v 1.83 1999/04/10 18:53:29 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c
index 0600c26dd178e..f7250cc55c0fa 100644
--- a/sys/nfsclient/nfs_vnops.c
+++ b/sys/nfsclient/nfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vnops.c	8.16 (Berkeley) 5/27/95
- * $Id: nfs_vnops.c,v 1.138 1999/07/31 01:51:58 msmith Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfsclient/nfsargs.h b/sys/nfsclient/nfsargs.h
index 6fd3a89efdaf9..c0cd18fae7768 100644
--- a/sys/nfsclient/nfsargs.h
+++ b/sys/nfsclient/nfsargs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.46 1999/05/02 23:56:23 alc Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NFS_NFS_H_
diff --git a/sys/nfsclient/nfsdiskless.h b/sys/nfsclient/nfsdiskless.h
index f499a2c4baead..487e0bf65226f 100644
--- a/sys/nfsclient/nfsdiskless.h
+++ b/sys/nfsclient/nfsdiskless.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsdiskless.h	8.2 (Berkeley) 3/30/95
- * $Id: nfsdiskless.h,v 1.9 1997/05/12 19:02:55 tegge Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfsclient/nfsm_subs.h b/sys/nfsclient/nfsm_subs.h
index 8533d529231d1..b13c0099b816c 100644
--- a/sys/nfsclient/nfsm_subs.h
+++ b/sys/nfsclient/nfsm_subs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $Id: nfsm_subs.h,v 1.25 1999/08/04 14:41:39 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfsclient/nfsmount.h b/sys/nfsclient/nfsmount.h
index ecb4f058d52a1..77ac7e329464f 100644
--- a/sys/nfsclient/nfsmount.h
+++ b/sys/nfsclient/nfsmount.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsmount.h	8.3 (Berkeley) 3/30/95
- * $Id: nfsmount.h,v 1.14 1998/05/19 07:11:27 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfsclient/nfsnode.h b/sys/nfsclient/nfsnode.h
index 49adeb21e5c7d..3bc818ff2594a 100644
--- a/sys/nfsclient/nfsnode.h
+++ b/sys/nfsclient/nfsnode.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsnode.h	8.9 (Berkeley) 5/14/95
- * $Id: nfsnode.h,v 1.27 1998/11/13 02:39:09 msmith Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfsclient/nfsstats.h b/sys/nfsclient/nfsstats.h
index 6fd3a89efdaf9..c0cd18fae7768 100644
--- a/sys/nfsclient/nfsstats.h
+++ b/sys/nfsclient/nfsstats.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.46 1999/05/02 23:56:23 alc Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NFS_NFS_H_
diff --git a/sys/nfsserver/nfs.h b/sys/nfsserver/nfs.h
index 6fd3a89efdaf9..c0cd18fae7768 100644
--- a/sys/nfsserver/nfs.h
+++ b/sys/nfsserver/nfs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.46 1999/05/02 23:56:23 alc Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NFS_NFS_H_
diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c
index b5ee411d946b9..a8ce893d85258 100644
--- a/sys/nfsserver/nfs_serv.c
+++ b/sys/nfsserver/nfs_serv.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_serv.c  8.8 (Berkeley) 7/31/95
- * $Id: nfs_serv.c,v 1.82 1999/07/28 08:20:49 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/nfsserver/nfs_srvcache.c b/sys/nfsserver/nfs_srvcache.c
index b5adf4a74bd95..b866cbe678131 100644
--- a/sys/nfsserver/nfs_srvcache.c
+++ b/sys/nfsserver/nfs_srvcache.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_srvcache.c	8.3 (Berkeley) 3/30/95
- * $Id: nfs_srvcache.c,v 1.16 1998/02/09 06:10:36 eivind Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c
index 8949d7a32fd80..0059c5119ec15 100644
--- a/sys/nfsserver/nfs_srvsock.c
+++ b/sys/nfsserver/nfs_srvsock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_socket.c	8.5 (Berkeley) 3/30/95
- * $Id: nfs_socket.c,v 1.52 1999/05/02 23:56:25 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c
index 9ffb490e1cfb0..d42c5ac645d93 100644
--- a/sys/nfsserver/nfs_srvsubs.c
+++ b/sys/nfsserver/nfs_srvsubs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c  8.8 (Berkeley) 5/22/95
- * $Id: nfs_subs.c,v 1.80 1999/08/08 18:42:55 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c
index 004bdd2d966e5..210dde6c5ccae 100644
--- a/sys/nfsserver/nfs_syscalls.c
+++ b/sys/nfsserver/nfs_syscalls.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_syscalls.c	8.5 (Berkeley) 3/30/95
- * $Id: nfs_syscalls.c,v 1.49 1999/04/27 11:17:52 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/nfsserver/nfsm_subs.h b/sys/nfsserver/nfsm_subs.h
index 8533d529231d1..b13c0099b816c 100644
--- a/sys/nfsserver/nfsm_subs.h
+++ b/sys/nfsserver/nfsm_subs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $Id: nfsm_subs.h,v 1.25 1999/08/04 14:41:39 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfsserver/nfsproto.h b/sys/nfsserver/nfsproto.h
index 665a187dd3b1e..cbb2832704bd2 100644
--- a/sys/nfsserver/nfsproto.h
+++ b/sys/nfsserver/nfsproto.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsproto.h  8.2 (Berkeley) 3/30/95
- * $Id: nfsproto.h,v 1.5 1998/05/31 19:00:19 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NFS_NFSPROTO_H_
diff --git a/sys/nfsserver/nfsrvcache.h b/sys/nfsserver/nfsrvcache.h
index a05ab31b2c301..eec5850bd3814 100644
--- a/sys/nfsserver/nfsrvcache.h
+++ b/sys/nfsserver/nfsrvcache.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsrvcache.h	8.3 (Berkeley) 3/30/95
- * $Id: nfsrvcache.h,v 1.10 1998/02/03 22:15:04 bde Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/nfsserver/nfsrvstats.h b/sys/nfsserver/nfsrvstats.h
index 6fd3a89efdaf9..c0cd18fae7768 100644
--- a/sys/nfsserver/nfsrvstats.h
+++ b/sys/nfsserver/nfsrvstats.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.46 1999/05/02 23:56:23 alc Exp $
+ * $FreeBSD$
  */
 
 #ifndef _NFS_NFS_H_
diff --git a/sys/ntfs/ntfs.h b/sys/ntfs/ntfs.h
index 657c97159d058..7aa65288a00cf 100644
--- a/sys/ntfs/ntfs.h
+++ b/sys/ntfs/ntfs.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs.h,v 1.4 1999/04/20 21:06:41 semenu Exp $
+ * $FreeBSD$
  */
 
 /*#define NTFS_DEBUG 1*/
diff --git a/sys/ntfs/ntfs_compr.c b/sys/ntfs/ntfs_compr.c
index 953b4169d1f15..412047be2caa9 100644
--- a/sys/ntfs/ntfs_compr.c
+++ b/sys/ntfs/ntfs_compr.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_compr.c,v 1.4 1999/05/12 09:42:54 semenu Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/ntfs/ntfs_compr.h b/sys/ntfs/ntfs_compr.h
index a79d3e239a26e..bdec08cc3e781 100644
--- a/sys/ntfs/ntfs_compr.h
+++ b/sys/ntfs/ntfs_compr.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_compr.h,v 1.3 1999/04/20 21:06:43 semenu Exp $
+ * $FreeBSD$
  */
 
 #define NTFS_COMPBLOCK_SIZE	0x1000
diff --git a/sys/ntfs/ntfs_extern.h b/sys/ntfs/ntfs_extern.h
index 197adf11d9efe..9f714382c2ef9 100644
--- a/sys/ntfs/ntfs_extern.h
+++ b/sys/ntfs/ntfs_extern.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_extern.h,v 1.3 1999/04/20 21:06:43 semenu Exp $
+ * $FreeBSD$
  */
 
 struct sockaddr;
diff --git a/sys/ntfs/ntfs_ihash.c b/sys/ntfs/ntfs_ihash.c
index e795545279085..50ee7ac173533 100644
--- a/sys/ntfs/ntfs_ihash.c
+++ b/sys/ntfs/ntfs_ihash.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_ihash.c	8.7 (Berkeley) 5/17/95
- * $Id: ntfs_ihash.c,v 1.4 1999/05/11 19:54:50 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/ntfs/ntfs_ihash.h b/sys/ntfs/ntfs_ihash.h
index 1b9c3dcd48a07..16132a90f9196 100644
--- a/sys/ntfs/ntfs_ihash.h
+++ b/sys/ntfs/ntfs_ihash.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_ihash.h,v 1.2 1999/04/20 21:06:43 semenu Exp $
+ * $FreeBSD$
  */
 
 void ntfs_nthashinit __P((void));
diff --git a/sys/ntfs/ntfs_inode.h b/sys/ntfs/ntfs_inode.h
index 0b6f6a202b26c..a61338552804a 100644
--- a/sys/ntfs/ntfs_inode.h
+++ b/sys/ntfs/ntfs_inode.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_inode.h,v 1.3 1999/04/20 21:06:43 semenu Exp $
+ * $FreeBSD$
  */
 
 /* These flags are kept in i_flag. */
diff --git a/sys/ntfs/ntfs_subr.c b/sys/ntfs/ntfs_subr.c
index 46b45de3d1a9a..b3e75b334d83e 100644
--- a/sys/ntfs/ntfs_subr.c
+++ b/sys/ntfs/ntfs_subr.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_subr.c,v 1.4 1999/05/12 09:43:01 semenu Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/ntfs/ntfs_subr.h b/sys/ntfs/ntfs_subr.h
index ca5f45cd4632a..f0b9a8a1df44d 100644
--- a/sys/ntfs/ntfs_subr.h
+++ b/sys/ntfs/ntfs_subr.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_subr.h,v 1.3 1999/04/20 21:06:43 semenu Exp $
+ * $FreeBSD$
  */
 
 #define	VA_LOADED		0x0001
diff --git a/sys/ntfs/ntfs_vfsops.c b/sys/ntfs/ntfs_vfsops.c
index 44877bd2e5d64..183d5dcd03cd5 100644
--- a/sys/ntfs/ntfs_vfsops.c
+++ b/sys/ntfs/ntfs_vfsops.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_vfsops.c,v 1.9 1999/08/13 10:29:29 phk Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/ntfs/ntfs_vfsops.h b/sys/ntfs/ntfs_vfsops.h
index 015684c90311c..d7f5f5d26a119 100644
--- a/sys/ntfs/ntfs_vfsops.h
+++ b/sys/ntfs/ntfs_vfsops.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_vfsops.h,v 1.2 1999/04/20 21:06:43 semenu Exp $
+ * $FreeBSD$
  */
 #define VG_DONTLOADIN	0x0001	/* Tells ntfs_vgetex to do not call */
 				/* ntfs_loadnode on ntnode, even if */
diff --git a/sys/ntfs/ntfs_vnops.c b/sys/ntfs/ntfs_vnops.c
index fff9add0a3221..578f8bf62dfb6 100644
--- a/sys/ntfs/ntfs_vnops.c
+++ b/sys/ntfs/ntfs_vnops.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfs_vnops.c,v 1.5 1999/05/12 09:43:06 semenu Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/ntfs/ntfsmount.h b/sys/ntfs/ntfsmount.h
index 1e6d322c71947..0a1f7918e383d 100644
--- a/sys/ntfs/ntfsmount.h
+++ b/sys/ntfs/ntfsmount.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ntfsmount.h,v 1.3 1999/04/20 21:06:44 semenu Exp $
+ * $FreeBSD$
  */
 
 #define	NTFS_MFLAG_CASEINS	0x00000001
diff --git a/sys/pc98/boot/Makefile b/sys/pc98/boot/Makefile
index 4af81f7ab1f42..904c72fd7786b 100644
--- a/sys/pc98/boot/Makefile
+++ b/sys/pc98/boot/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
   
 SUBDIR=	biosboot kzipboot netboot rawboot
 
diff --git a/sys/pc98/boot/Makefile.inc b/sys/pc98/boot/Makefile.inc
index 88916943ec966..a3603a63e9393 100644
--- a/sys/pc98/boot/Makefile.inc
+++ b/sys/pc98/boot/Makefile.inc
@@ -1,4 +1,4 @@
-#	$Id: Makefile.inc,v 1.3 1998/03/14 02:33:54 kato Exp $
+# $FreeBSD$
 
 BINDIR?=	/usr/mdec
 CFLAGS+=	-aout
diff --git a/sys/pc98/boot/biosboot/Makefile b/sys/pc98/boot/biosboot/Makefile
index 3a2640c950d35..925028d109ad9 100644
--- a/sys/pc98/boot/biosboot/Makefile
+++ b/sys/pc98/boot/biosboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.21 1999/01/03 05:03:46 kato Exp $
+# $FreeBSD$
 #
 
 PROG=	boot
diff --git a/sys/pc98/boot/biosboot/README.386BSD b/sys/pc98/boot/biosboot/README.386BSD
index e9423ecc1fd56..3d7c09da59684 100644
--- a/sys/pc98/boot/biosboot/README.386BSD
+++ b/sys/pc98/boot/biosboot/README.386BSD
@@ -169,4 +169,4 @@ Before you do this ensure you have a booting floppy with correct
 disktab and bootblock files on it so that if it doesn't work, you can
 re-disklabel from the floppy.
 
-$Id: README.386BSD,v 1.10 1998/09/15 09:59:58 gibbs Exp $
+$FreeBSD$
diff --git a/sys/pc98/boot/biosboot/README.MACH b/sys/pc98/boot/biosboot/README.MACH
index e5562c096a88e..73d090a404bd4 100644
--- a/sys/pc98/boot/biosboot/README.MACH
+++ b/sys/pc98/boot/biosboot/README.MACH
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:33:55  rpd
- *	$Id: README.MACH,v 1.3 1997/02/22 09:43:02 peter Exp $
+ * $FreeBSD$
  */
 
 ********NOTE: This is not all relevant to the 386BSD version**********
diff --git a/sys/pc98/boot/biosboot/README.serial b/sys/pc98/boot/biosboot/README.serial
index bf47e6c4a4701..7edcdeec060c9 100644
--- a/sys/pc98/boot/biosboot/README.serial
+++ b/sys/pc98/boot/biosboot/README.serial
@@ -193,4 +193,4 @@ CAVEATS:
 	  from the new kernel.
 
 
-$Id: README.serial,v 1.5 1998/04/07 15:33:47 kato Exp $
+$FreeBSD$
diff --git a/sys/pc98/boot/biosboot/asm.S b/sys/pc98/boot/biosboot/asm.S
index 77a4b2f261d3e..f14c7f55104cc 100644
--- a/sys/pc98/boot/biosboot/asm.S
+++ b/sys/pc98/boot/biosboot/asm.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:13  rpd
- *	$Id: asm.S,v 1.3 1997/02/22 09:43:03 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/pc98/boot/biosboot/asm.h b/sys/pc98/boot/biosboot/asm.h
index b90bbcebf158b..6f4bcc39e52d3 100644
--- a/sys/pc98/boot/biosboot/asm.h
+++ b/sys/pc98/boot/biosboot/asm.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.7  92/02/29  15:33:41  rpd
- *	$Id$
+ * $FreeBSD$
  */
 
 #define S_ARG0	 4(%esp)
diff --git a/sys/pc98/boot/biosboot/bios.S b/sys/pc98/boot/biosboot/bios.S
index 2d456512c1e06..88d9506c46b47 100644
--- a/sys/pc98/boot/biosboot/bios.S
+++ b/sys/pc98/boot/biosboot/bios.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- *	$Id: bios.S,v 1.8 1997/07/13 12:13:01 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/boot/biosboot/boot.c b/sys/pc98/boot/biosboot/boot.c
index 5de351fe82293..c225bd35bda31 100644
--- a/sys/pc98/boot/biosboot/boot.c
+++ b/sys/pc98/boot/biosboot/boot.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, [92/04/03  16:51:14  rvb]
- *	$Id: boot.c,v 1.18 1998/10/05 07:58:05 kato Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/pc98/boot/biosboot/boot.h b/sys/pc98/boot/biosboot/boot.h
index 32941f9ea4180..4e32192eebc65 100644
--- a/sys/pc98/boot/biosboot/boot.h
+++ b/sys/pc98/boot/biosboot/boot.h
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:03  rpd
- *	$Id: boot.h,v 1.13 1997/12/05 11:50:39 kato Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/pc98/boot/biosboot/disk.c b/sys/pc98/boot/biosboot/disk.c
index 0d38ebce98c94..ad9d3ff74d882 100644
--- a/sys/pc98/boot/biosboot/disk.c
+++ b/sys/pc98/boot/biosboot/disk.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:49  rpd
- *	$Id: disk.c,v 1.8 1997/02/22 09:43:07 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/boot/biosboot/io.c b/sys/pc98/boot/biosboot/io.c
index 0e4b6f3f30b94..3b540dd1c8921 100644
--- a/sys/pc98/boot/biosboot/io.c
+++ b/sys/pc98/boot/biosboot/io.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:35:57  rpd
- *	$Id: io.c,v 1.12 1997/07/13 12:13:02 kato Exp $
+ * $FreeBSD$
  */
 
 #include "boot.h"
diff --git a/sys/pc98/boot/biosboot/serial.S b/sys/pc98/boot/biosboot/serial.S
index 2cc22465fe79d..f2df31aec6cfb 100644
--- a/sys/pc98/boot/biosboot/serial.S
+++ b/sys/pc98/boot/biosboot/serial.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:34:26  rpd
- *	$Id: serial.S,v 1.7 1998/01/02 09:29:15 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/boot/biosboot/start.S b/sys/pc98/boot/biosboot/start.S
index 013a40b142ec7..a7e69355d621f 100644
--- a/sys/pc98/boot/biosboot/start.S
+++ b/sys/pc98/boot/biosboot/start.S
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:29  rpd
- *	$Id: start.S,v 1.5 1998/05/02 02:06:07 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/boot/biosboot/sys.c b/sys/pc98/boot/biosboot/sys.c
index ab70bbe0dbfe8..1b138b36d4797 100644
--- a/sys/pc98/boot/biosboot/sys.c
+++ b/sys/pc98/boot/biosboot/sys.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:34  rpd
- *	$Id: sys.c,v 1.14 1998/04/12 04:48:11 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/boot/biosboot/table.c b/sys/pc98/boot/biosboot/table.c
index 4542942b7964d..81dc130a0314a 100644
--- a/sys/pc98/boot/biosboot/table.c
+++ b/sys/pc98/boot/biosboot/table.c
@@ -24,7 +24,7 @@
  * the rights to redistribute these changes.
  *
  *	from: Mach, Revision 2.2  92/04/04  11:36:43  rpd
- *	$Id: table.c,v 1.7 1998/09/15 14:08:34 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/boot/kzipboot/Makefile b/sys/pc98/boot/kzipboot/Makefile
index beb70a5e56ccb..6bf04e18bdde6 100644
--- a/sys/pc98/boot/kzipboot/Makefile
+++ b/sys/pc98/boot/kzipboot/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.6 1998/05/28 13:48:40 kato Exp $
+# $FreeBSD$
 
 PROG= kztail.o kzhead.o
 BINMODE = 444	# target is a relocatable object
diff --git a/sys/pc98/boot/netboot/3c509.c b/sys/pc98/boot/netboot/3c509.c
index adf721c3ec19d..accc948c6b4f6 100644
--- a/sys/pc98/boot/netboot/3c509.c
+++ b/sys/pc98/boot/netboot/3c509.c
@@ -18,7 +18,7 @@ Author: Martin Renters.
 
 3c509 support added by Serge Babkin (babkin@hq.icb.chel.su)
 
-$Id$
+$FreeBSD$
 
 ***************************************************************************/
 
diff --git a/sys/pc98/boot/rawboot/Makefile b/sys/pc98/boot/rawboot/Makefile
index 7aafe0de65fd0..be5f4cab8f79b 100644
--- a/sys/pc98/boot/rawboot/Makefile
+++ b/sys/pc98/boot/rawboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.11 1998/03/30 12:24:12 kato Exp $
+# $FreeBSD$
 #
 
 PROG=	boot
diff --git a/sys/pc98/cbus/cbus.h b/sys/pc98/cbus/cbus.h
index 50abf69750432..e148441fb84e6 100644
--- a/sys/pc98/cbus/cbus.h
+++ b/sys/pc98/cbus/cbus.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- *	$Id: pc98.h,v 1.10 1997/02/22 09:43:42 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _PC98_PC98_PC98_H_
diff --git a/sys/pc98/cbus/cbus_dma.c b/sys/pc98/cbus/cbus_dma.c
index 9bf92aeb2cd03..10573944d479d 100644
--- a/sys/pc98/cbus/cbus_dma.c
+++ b/sys/pc98/cbus/cbus_dma.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa_dma.c,v 1.3 1999/05/10 09:09:08 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c
index eb9636363b106..ba644841a9e45 100644
--- a/sys/pc98/cbus/clock.c
+++ b/sys/pc98/cbus/clock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.74 1999/07/30 11:43:10 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c
index feae60901435a..267eefc4864ae 100644
--- a/sys/pc98/cbus/fdc.c
+++ b/sys/pc98/cbus/fdc.c
@@ -47,7 +47,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.68 1999/08/14 11:40:47 phk Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/pc98/cbus/fdcreg.h b/sys/pc98/cbus/fdcreg.h
index b02fc4f1e7e55..ae95cf2838851 100644
--- a/sys/pc98/cbus/fdcreg.h
+++ b/sys/pc98/cbus/fdcreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)fdreg.h	7.1 (Berkeley) 5/9/91
- *	$Id: fdreg.h,v 1.4 1997/02/22 09:43:34 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/cbus/gdc.c b/sys/pc98/cbus/gdc.c
index 4702090d54c7d..64da302638238 100644
--- a/sys/pc98/cbus/gdc.c
+++ b/sys/pc98/cbus/gdc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: pc98gdc.c,v 1.10 1999/06/24 10:51:29 kato Exp $
+ * $FreeBSD$
  */
 
 #include "gdc.h"
diff --git a/sys/pc98/cbus/olpt.c b/sys/pc98/cbus/olpt.c
index fd35291284196..cb4b8d03b865a 100644
--- a/sys/pc98/cbus/olpt.c
+++ b/sys/pc98/cbus/olpt.c
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	from: unknown origin, 386BSD 0.1
- *	$Id: olpt.c,v 1.2 1999/07/06 19:23:20 des Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/cbus/pckbd.c b/sys/pc98/cbus/pckbd.c
index bcc707768b386..bbd10a477adde 100644
--- a/sys/pc98/cbus/pckbd.c
+++ b/sys/pc98/cbus/pckbd.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: pc98kbd.c,v 1.9 1999/08/23 13:50:08 kato Exp $
+ * $FreeBSD$
  */
 
 #include "pckbd.h"
diff --git a/sys/pc98/cbus/pcrtc.c b/sys/pc98/cbus/pcrtc.c
index eb9636363b106..ba644841a9e45 100644
--- a/sys/pc98/cbus/pcrtc.c
+++ b/sys/pc98/cbus/pcrtc.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.74 1999/07/30 11:43:10 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/cbus/ppc.c b/sys/pc98/cbus/ppc.c
index e21d8413f3d00..266c015404844 100644
--- a/sys/pc98/cbus/ppc.c
+++ b/sys/pc98/cbus/ppc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  *
  */
 #include "ppc.h"
diff --git a/sys/pc98/cbus/ppcreg.h b/sys/pc98/cbus/ppcreg.h
index 3acbbf62cdf5f..4e85f41cb95d2 100644
--- a/sys/pc98/cbus/ppcreg.h
+++ b/sys/pc98/cbus/ppcreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  *
  */
 #ifndef __PPCREG_H
diff --git a/sys/pc98/cbus/sc_machdep.h b/sys/pc98/cbus/sc_machdep.h
index e48c5e2209ab2..be8419f2df02f 100644
--- a/sys/pc98/cbus/sc_machdep.h
+++ b/sys/pc98/cbus/sc_machdep.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: sc_machdep.h,v 1.1 1999/06/24 10:51:31 kato Exp $
+ * $FreeBSD$
  */
 
 #ifndef _PC98_PC98_SC_MACHDEP_H_
diff --git a/sys/pc98/cbus/scgdcrndr.c b/sys/pc98/cbus/scgdcrndr.c
index 68730e5f151af..ba28a7022de2b 100644
--- a/sys/pc98/cbus/scgdcrndr.c
+++ b/sys/pc98/cbus/scgdcrndr.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: scgdcrndr.c,v 1.1 1999/06/24 10:51:32 kato Exp $
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/pc98/cbus/scvtb.c b/sys/pc98/cbus/scvtb.c
index 2f6f49dbb4072..6be4a99cb09fa 100644
--- a/sys/pc98/cbus/scvtb.c
+++ b/sys/pc98/cbus/scvtb.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: scvtbpc98.c,v 1.2 1999/06/24 14:03:07 kato Exp $
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index 857bd2b1c8c14..565b27ddcde45 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sio.c,v 1.102 1999/08/17 04:33:11 nyan Exp $
+ * $FreeBSD$
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.234
  */
diff --git a/sys/pc98/cbus/syscons_cbus.c b/sys/pc98/cbus/syscons_cbus.c
index 51d0917d6788d..8bf43db127dbb 100644
--- a/sys/pc98/cbus/syscons_cbus.c
+++ b/sys/pc98/cbus/syscons_cbus.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: syscons_pc98.c,v 1.3 1999/07/03 08:50:45 kato Exp $
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 1c47ba7ac6f7d..05c3b8bf2eb96 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC98,v 1.83 1999/08/15 09:38:21 phk Exp $
+# $FreeBSD$
 
 # GENERIC98 -- Generic PC98 machine with WD/SCSI disks
 
diff --git a/sys/pc98/conf/GENERIC98 b/sys/pc98/conf/GENERIC98
index 1c47ba7ac6f7d..05c3b8bf2eb96 100644
--- a/sys/pc98/conf/GENERIC98
+++ b/sys/pc98/conf/GENERIC98
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC98,v 1.83 1999/08/15 09:38:21 phk Exp $
+# $FreeBSD$
 
 # GENERIC98 -- Generic PC98 machine with WD/SCSI disks
 
diff --git a/sys/pc98/conf/Makefile.pc98 b/sys/pc98/conf/Makefile.pc98
index 8740d2398e81c..48492d5fc6eae 100644
--- a/sys/pc98/conf/Makefile.pc98
+++ b/sys/pc98/conf/Makefile.pc98
@@ -3,7 +3,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.pc98,v 1.66 1999/07/03 08:17:40 kato Exp $
+# $FreeBSD$
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/pc98/conf/devices.pc98 b/sys/pc98/conf/devices.pc98
index 0de2c6f1cc874..0e3045546c933 100644
--- a/sys/pc98/conf/devices.pc98
+++ b/sys/pc98/conf/devices.pc98
@@ -1,6 +1,6 @@
 # This file tells what major numbers the various possible swap devices have.
 #
-#	$Id: devices.pc98,v 1.7 1998/12/30 07:51:20 kato Exp $
+# $FreeBSD$
 #
 wd	0
 wfd	1
diff --git a/sys/pc98/conf/files.pc98 b/sys/pc98/conf/files.pc98
index 359b379f40304..84d3f62a989bc 100644
--- a/sys/pc98/conf/files.pc98
+++ b/sys/pc98/conf/files.pc98
@@ -3,7 +3,7 @@
 #
 # modified for PC-9801
 #
-#	$Id: files.pc98,v 1.105 1999/08/09 10:34:59 phk Exp $
+# $FreeBSD$
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/pc98/conf/majors.pc98 b/sys/pc98/conf/majors.pc98
index 50265b21d2068..7d56998aa1898 100644
--- a/sys/pc98/conf/majors.pc98
+++ b/sys/pc98/conf/majors.pc98
@@ -1,4 +1,4 @@
-$Id: majors.pc98,v 1.62 1999/08/08 11:12:51 kato Exp $
+$FreeBSD$
 
 Hopefully, this list will one day be obsoleted by DEVFS, but for now
 this is the current allocation of device major numbers.
diff --git a/sys/pc98/conf/options.pc98 b/sys/pc98/conf/options.pc98
index 3c46c2decce37..9906c9b413ebf 100644
--- a/sys/pc98/conf/options.pc98
+++ b/sys/pc98/conf/options.pc98
@@ -1,4 +1,4 @@
-#	$Id: options.pc98,v 1.92 1999/08/08 11:13:47 kato Exp $
+# $FreeBSD$
 
 DISABLE_PSE
 IDE_DELAY
diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c
index 52f786f19c6c4..939e2289b29e0 100644
--- a/sys/pc98/i386/machdep.c
+++ b/sys/pc98/i386/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.129 1999/08/09 10:35:00 phk Exp $
+ * $FreeBSD$
  */
 
 #include "apm.h"
diff --git a/sys/pc98/i386/userconfig.c b/sys/pc98/i386/userconfig.c
index c52b97a6141b0..b2859eaf14d7f 100644
--- a/sys/pc98/i386/userconfig.c
+++ b/sys/pc98/i386/userconfig.c
@@ -46,7 +46,7 @@
  ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  **
- **      $Id: userconfig.c,v 1.87 1999/08/10 08:35:57 kato Exp $
+ ** $FreeBSD$
  **/
 
 /**
@@ -2561,7 +2561,7 @@ visuserconfig(void)
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: userconfig.c,v 1.87 1999/08/10 08:35:57 kato Exp $
+ * $FreeBSD$
  */
 
 #include "scbus.h"
diff --git a/sys/pc98/pc98/atcompat_diskslice.c b/sys/pc98/pc98/atcompat_diskslice.c
index b2c1d38a4bb46..ee18554b8ce72 100644
--- a/sys/pc98/pc98/atcompat_diskslice.c
+++ b/sys/pc98/pc98/atcompat_diskslice.c
@@ -35,7 +35,7 @@
  *
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- *	$Id: atcompat_diskslice.c,v 1.16 1999/06/26 02:47:14 mckusick Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/pc98/clock.c b/sys/pc98/pc98/clock.c
index eb9636363b106..ba644841a9e45 100644
--- a/sys/pc98/pc98/clock.c
+++ b/sys/pc98/pc98/clock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.74 1999/07/30 11:43:10 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/pc98/diskslice_machdep.c b/sys/pc98/pc98/diskslice_machdep.c
index 3841c814c72ee..1bc1e7653adcf 100644
--- a/sys/pc98/pc98/diskslice_machdep.c
+++ b/sys/pc98/pc98/diskslice_machdep.c
@@ -35,7 +35,7 @@
  *
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- *	$Id: diskslice_machdep.c,v 1.21 1999/08/08 10:06:27 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c
index feae60901435a..267eefc4864ae 100644
--- a/sys/pc98/pc98/fd.c
+++ b/sys/pc98/pc98/fd.c
@@ -47,7 +47,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.68 1999/08/14 11:40:47 phk Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/pc98/pc98/fdreg.h b/sys/pc98/pc98/fdreg.h
index b02fc4f1e7e55..ae95cf2838851 100644
--- a/sys/pc98/pc98/fdreg.h
+++ b/sys/pc98/pc98/fdreg.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)fdreg.h	7.1 (Berkeley) 5/9/91
- *	$Id: fdreg.h,v 1.4 1997/02/22 09:43:34 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/pc98/if_ed.c b/sys/pc98/pc98/if_ed.c
index 53aad1eeb4959..2f8d4a29bcf74 100644
--- a/sys/pc98/pc98/if_ed.c
+++ b/sys/pc98/pc98/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.66 1999/08/10 12:55:06 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/pc98/if_ed98.h b/sys/pc98/pc98/if_ed98.h
index a7e4a0510f08c..44b77f41de88e 100644
--- a/sys/pc98/pc98/if_ed98.h
+++ b/sys/pc98/pc98/if_ed98.h
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * 	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/pc98/isa_dma.c b/sys/pc98/pc98/isa_dma.c
index 9bf92aeb2cd03..10573944d479d 100644
--- a/sys/pc98/pc98/isa_dma.c
+++ b/sys/pc98/pc98/isa_dma.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa_dma.c,v 1.3 1999/05/10 09:09:08 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index 52f786f19c6c4..939e2289b29e0 100644
--- a/sys/pc98/pc98/machdep.c
+++ b/sys/pc98/pc98/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.129 1999/08/09 10:35:00 phk Exp $
+ * $FreeBSD$
  */
 
 #include "apm.h"
diff --git a/sys/pc98/pc98/mse.c b/sys/pc98/pc98/mse.c
index b82d1d37bfde2..23ce0f88e6688 100644
--- a/sys/pc98/pc98/mse.c
+++ b/sys/pc98/pc98/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $Id: mse.c,v 1.22 1999/05/31 11:28:36 phk Exp $
+ * $FreeBSD$
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
diff --git a/sys/pc98/pc98/npx.c b/sys/pc98/pc98/npx.c
index d44207eba142a..786b017805385 100644
--- a/sys/pc98/pc98/npx.c
+++ b/sys/pc98/pc98/npx.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.49 1999/07/26 12:22:41 kato Exp $
+ * $FreeBSD$
  */
 
 #include "npx.h"
diff --git a/sys/pc98/pc98/olpt.c b/sys/pc98/pc98/olpt.c
index fd35291284196..cb4b8d03b865a 100644
--- a/sys/pc98/pc98/olpt.c
+++ b/sys/pc98/pc98/olpt.c
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	from: unknown origin, 386BSD 0.1
- *	$Id: olpt.c,v 1.2 1999/07/06 19:23:20 des Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/pc98/pc98.c b/sys/pc98/pc98/pc98.c
index b7d96a10e2999..8517f9723bb81 100644
--- a/sys/pc98/pc98/pc98.c
+++ b/sys/pc98/pc98/pc98.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: pc98.c,v 1.55 1998/12/02 08:04:12 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/pc98/pc98.h b/sys/pc98/pc98/pc98.h
index 50abf69750432..e148441fb84e6 100644
--- a/sys/pc98/pc98/pc98.h
+++ b/sys/pc98/pc98/pc98.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- *	$Id: pc98.h,v 1.10 1997/02/22 09:43:42 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _PC98_PC98_PC98_H_
diff --git a/sys/pc98/pc98/pc98gdc.c b/sys/pc98/pc98/pc98gdc.c
index 4702090d54c7d..64da302638238 100644
--- a/sys/pc98/pc98/pc98gdc.c
+++ b/sys/pc98/pc98/pc98gdc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: pc98gdc.c,v 1.10 1999/06/24 10:51:29 kato Exp $
+ * $FreeBSD$
  */
 
 #include "gdc.h"
diff --git a/sys/pc98/pc98/pc98kbd.c b/sys/pc98/pc98/pc98kbd.c
index bcc707768b386..bbd10a477adde 100644
--- a/sys/pc98/pc98/pc98kbd.c
+++ b/sys/pc98/pc98/pc98kbd.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: pc98kbd.c,v 1.9 1999/08/23 13:50:08 kato Exp $
+ * $FreeBSD$
  */
 
 #include "pckbd.h"
diff --git a/sys/pc98/pc98/pcaudio.c b/sys/pc98/pc98/pcaudio.c
index 5c8dbf27a1fc6..e6181d93ef1b3 100644
--- a/sys/pc98/pc98/pcaudio.c
+++ b/sys/pc98/pc98/pcaudio.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: pcaudio.c,v 1.24 1999/05/31 11:28:38 phk Exp $
+ * $FreeBSD$
  */
 
 #include "pca.h"
diff --git a/sys/pc98/pc98/ppc.c b/sys/pc98/pc98/ppc.c
index e21d8413f3d00..266c015404844 100644
--- a/sys/pc98/pc98/ppc.c
+++ b/sys/pc98/pc98/ppc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  *
  */
 #include "ppc.h"
diff --git a/sys/pc98/pc98/ppcreg.h b/sys/pc98/pc98/ppcreg.h
index 3acbbf62cdf5f..4e85f41cb95d2 100644
--- a/sys/pc98/pc98/ppcreg.h
+++ b/sys/pc98/pc98/ppcreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  *
  */
 #ifndef __PPCREG_H
diff --git a/sys/pc98/pc98/sc_machdep.h b/sys/pc98/pc98/sc_machdep.h
index e48c5e2209ab2..be8419f2df02f 100644
--- a/sys/pc98/pc98/sc_machdep.h
+++ b/sys/pc98/pc98/sc_machdep.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: sc_machdep.h,v 1.1 1999/06/24 10:51:31 kato Exp $
+ * $FreeBSD$
  */
 
 #ifndef _PC98_PC98_SC_MACHDEP_H_
diff --git a/sys/pc98/pc98/scgdcrndr.c b/sys/pc98/pc98/scgdcrndr.c
index 68730e5f151af..ba28a7022de2b 100644
--- a/sys/pc98/pc98/scgdcrndr.c
+++ b/sys/pc98/pc98/scgdcrndr.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: scgdcrndr.c,v 1.1 1999/06/24 10:51:32 kato Exp $
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/pc98/pc98/scvtbpc98.c b/sys/pc98/pc98/scvtbpc98.c
index 2f6f49dbb4072..6be4a99cb09fa 100644
--- a/sys/pc98/pc98/scvtbpc98.c
+++ b/sys/pc98/pc98/scvtbpc98.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: scvtbpc98.c,v 1.2 1999/06/24 14:03:07 kato Exp $
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c
index 857bd2b1c8c14..565b27ddcde45 100644
--- a/sys/pc98/pc98/sio.c
+++ b/sys/pc98/pc98/sio.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sio.c,v 1.102 1999/08/17 04:33:11 nyan Exp $
+ * $FreeBSD$
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.234
  */
diff --git a/sys/pc98/pc98/spkr.c b/sys/pc98/pc98/spkr.c
index 44b2dd67d19a8..1d13188625391 100644
--- a/sys/pc98/pc98/spkr.c
+++ b/sys/pc98/pc98/spkr.c
@@ -4,7 +4,7 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- *    $Id: spkr.c,v 1.17 1999/08/18 08:24:35 kato Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/pc98/syscons.c b/sys/pc98/pc98/syscons.c
index 85a547c1fd2a2..c3fb5b1804847 100644
--- a/sys/pc98/pc98/syscons.c
+++ b/sys/pc98/pc98/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.127 1999/08/27 07:26:25 julian Exp $
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/pc98/pc98/syscons_pc98.c b/sys/pc98/pc98/syscons_pc98.c
index 51d0917d6788d..8bf43db127dbb 100644
--- a/sys/pc98/pc98/syscons_pc98.c
+++ b/sys/pc98/pc98/syscons_pc98.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: syscons_pc98.c,v 1.3 1999/07/03 08:50:45 kato Exp $
+ * $FreeBSD$
  */
 
 #include "sc.h"
diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c
index 1c20cb6fc6b55..4f118d04972d4 100644
--- a/sys/pc98/pc98/wd.c
+++ b/sys/pc98/pc98/wd.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.86 1999/08/14 11:40:47 phk Exp $
+ * $FreeBSD$
  */
 
 /* TODO:
diff --git a/sys/pc98/pc98/wd_cd.c b/sys/pc98/pc98/wd_cd.c
index 865f82bae6a26..72412a931331d 100644
--- a/sys/pc98/pc98/wd_cd.c
+++ b/sys/pc98/pc98/wd_cd.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: atapi-cd.c,v 1.20 1999/05/31 11:25:51 phk Exp $
+ * $FreeBSD$
  */
 
 #include "wdc.h"
diff --git a/sys/pc98/pc98/wfd.c b/sys/pc98/pc98/wfd.c
index a089527fa1eab..f7837d7407bfd 100644
--- a/sys/pc98/pc98/wfd.c
+++ b/sys/pc98/pc98/wfd.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $Id: wfd.c,v 1.27 1999/08/14 11:40:41 phk Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pc98/pc98/wst.c b/sys/pc98/pc98/wst.c
index 7337796969a5c..5dae30e4e97a4 100644
--- a/sys/pc98/pc98/wst.c
+++ b/sys/pc98/pc98/wst.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: wst.c,v 1.23 1999/05/31 11:26:39 phk Exp $
+ * $FreeBSD$
  */
 
 #include "wdc.h"
diff --git a/sys/pccard/pccard.c b/sys/pccard/pccard.c
index 07be6c1c21ea6..6497ce4c5044f 100644
--- a/sys/pccard/pccard.c
+++ b/sys/pccard/pccard.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: pccard.c,v 1.81 1999/08/01 18:12:50 imp Exp $
+ * $FreeBSD$
  */
 
 #include "opt_pcic.h"
diff --git a/sys/pccard/pcic.h b/sys/pccard/pcic.h
index 34ae30c7c543e..5988089d43cd9 100644
--- a/sys/pccard/pcic.h
+++ b/sys/pccard/pcic.h
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcic.h,v 1.0 1999/02/26 20:52:54 roger Exp $ 
+ * $FreeBSD$ 
 */
 
 int register_pcic_intr(int intr, int device_id, u_int flags,
diff --git a/sys/pccard/pcic_pci.c b/sys/pccard/pcic_pci.c
index e596a75fbce44..5b23c5e57c27e 100644
--- a/sys/pccard/pcic_pci.c
+++ b/sys/pccard/pcic_pci.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcic_p.c,v 1.12 1999/05/09 17:07:11 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/pccard/pcic_pci.h b/sys/pccard/pcic_pci.h
index 47934f3d02a90..bd8e06c79e45a 100644
--- a/sys/pccard/pcic_pci.h
+++ b/sys/pccard/pcic_pci.h
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcic_p.h,v 1.5 1999/04/01 15:28:10 nsayer Exp $
+ * $FreeBSD$
  */
 
 /* PCI/CardBus Device IDs */
diff --git a/sys/pci/adv_pci.c b/sys/pci/adv_pci.c
index 1ca2cee1e5978..8f8fc58f374b1 100644
--- a/sys/pci/adv_pci.c
+++ b/sys/pci/adv_pci.c
@@ -47,7 +47,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: adv_pci.c,v 1.7 1999/07/03 20:16:58 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/pci/adw_pci.c b/sys/pci/adw_pci.c
index 6509786305456..10eda815814ac 100644
--- a/sys/pci/adw_pci.c
+++ b/sys/pci/adw_pci.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: adw_pci.c,v 1.6 1999/07/03 20:16:58 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/pci/ahc_pci.c b/sys/pci/ahc_pci.c
index 54f429f9bab59..64fcbd53c8f6e 100644
--- a/sys/pci/ahc_pci.c
+++ b/sys/pci/ahc_pci.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ahc_pci.c,v 1.17 1999/08/16 02:33:46 gibbs Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/pci/alpm.c b/sys/pci/alpm.c
index 4f98d1a44299d..ff4c5d3fb435a 100644
--- a/sys/pci/alpm.c
+++ b/sys/pci/alpm.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alpm.c,v 1.5 1999/07/03 20:17:00 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/pci/brktree_reg.h b/sys/pci/brktree_reg.h
index ab34cec12cd65..643d3f353f58b 100644
--- a/sys/pci/brktree_reg.h
+++ b/sys/pci/brktree_reg.h
@@ -30,7 +30,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: brktree_reg.h,v 1.29 1999/06/12 14:54:56 roger Exp $
+ * $FreeBSD$
  */
 #ifndef PCI_LATENCY_TIMER
 #define	PCI_LATENCY_TIMER		0x0c	/* pci timer register */
diff --git a/sys/pci/brooktree848.c b/sys/pci/brooktree848.c
index 27b73d013a7d9..46cf72e121e6c 100644
--- a/sys/pci/brooktree848.c
+++ b/sys/pci/brooktree848.c
@@ -1,4 +1,4 @@
-/* $Id: brooktree848.c,v 1.89 1999/07/12 15:51:48 roger Exp $ */
+/* $FreeBSD$ */
 /* BT848 Driver for Brooktree's Bt848, Bt848A, Bt849A, Bt878, Bt879 based cards.
    The Brooktree  BT848 Driver driver is based upon Mark Tinguely and
    Jim Lowe's driver for the Matrox Meteor PCI card . The 
diff --git a/sys/pci/bt848_i2c.c b/sys/pci/bt848_i2c.c
index a3a1fdd737da3..5e4ecc9a8f292 100644
--- a/sys/pci/bt848_i2c.c
+++ b/sys/pci/bt848_i2c.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bt848_i2c.c,v 1.5 1999/07/03 20:17:01 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/pci/bt848_i2c.h b/sys/pci/bt848_i2c.h
index c7d22c50484e7..075e9885ae5d2 100644
--- a/sys/pci/bt848_i2c.h
+++ b/sys/pci/bt848_i2c.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  *
  */
 #ifndef _BT848_I2C_H
diff --git a/sys/pci/bt_pci.c b/sys/pci/bt_pci.c
index 5aa884444497b..154a2f2febc37 100644
--- a/sys/pci/bt_pci.c
+++ b/sys/pci/bt_pci.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bt_pci.c,v 1.8 1999/07/03 20:17:01 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/pci/cy_pci.c b/sys/pci/cy_pci.c
index 61848c3213deb..71e16953af7ad 100644
--- a/sys/pci/cy_pci.c
+++ b/sys/pci/cy_pci.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cy_pci.c,v 1.15 1999/05/10 10:23:38 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/cy_pcireg.h b/sys/pci/cy_pcireg.h
index 150dc54ae57d6..707c4db62fece 100644
--- a/sys/pci/cy_pcireg.h
+++ b/sys/pci/cy_pcireg.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cy_pcireg.h,v 1.5 1999/01/11 23:43:54 bde Exp $
+ * $FreeBSD$
  */
 
 #define CY_PCI_BASE_ADDR0		0x10
diff --git a/sys/pci/dpt_pci.c b/sys/pci/dpt_pci.c
index 3828d08b6cb0f..9df90db97c002 100644
--- a/sys/pci/dpt_pci.c
+++ b/sys/pci/dpt_pci.c
@@ -32,7 +32,7 @@
  *  dptpci.c:  PCI Bus Attachment for DPT SCSI HBAs
  */
 
-#ident "$Id: dpt_pci.c,v 1.14 1999/08/16 01:52:20 gibbs Exp $"
+#ident "$FreeBSD$"
 
 #include "opt_dpt.h"
 
diff --git a/sys/pci/dpt_pci.h b/sys/pci/dpt_pci.h
index 4db7bf985f57e..fe7206a1882d9 100644
--- a/sys/pci/dpt_pci.h
+++ b/sys/pci/dpt_pci.h
@@ -28,7 +28,7 @@
  *
  */
 
-#ident "$Id: dpt_pci.h,v 1.3 1997/10/02 04:25:30 ShimonR Exp $"
+#ident "$FreeBSD$"
 
 #define DPT_VENDOR_ID             0x00001044
 #define DPT_DEVICE_ID             0x0000a400
diff --git a/sys/pci/es1370.c b/sys/pci/es1370.c
index dff26f8fb6a77..d1370aa08f549 100644
--- a/sys/pci/es1370.c
+++ b/sys/pci/es1370.c
@@ -36,7 +36,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: es1370.c,v 1.5 1999/06/15 00:00:10 newton Exp $
+ * $FreeBSD$
  */
 
 #include "pcm.h"
diff --git a/sys/pci/es1370_reg.h b/sys/pci/es1370_reg.h
index 72546c61449a2..a1adc354be7b1 100644
--- a/sys/pci/es1370_reg.h
+++ b/sys/pci/es1370_reg.h
@@ -18,7 +18,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _ES1370_REG_H
diff --git a/sys/pci/ida_pci.c b/sys/pci/ida_pci.c
index 330ce7ca1941a..70007fb87d436 100644
--- a/sys/pci/ida_pci.c
+++ b/sys/pci/ida_pci.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ida_pci.c,v 1.3 1999/07/29 01:03:02 mdodd Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/pci/ide_pci.c b/sys/pci/ide_pci.c
index d71bfcc4f5486..9870df27ff55c 100644
--- a/sys/pci/ide_pci.c
+++ b/sys/pci/ide_pci.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ide_pci.c,v 1.38 1999/07/22 19:45:33 julian Exp $
+ * $FreeBSD$
  */
 
 #include "wd.h"
diff --git a/sys/pci/ide_pcireg.h b/sys/pci/ide_pcireg.h
index 769645f331349..1f1c540be300e 100644
--- a/sys/pci/ide_pcireg.h
+++ b/sys/pci/ide_pcireg.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	From: wd82371reg.h,v 1.3 1997/02/22 09:44:15 peter Exp $
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _PCI_IDEPCIREG_H_
diff --git a/sys/pci/if_al.c b/sys/pci/if_al.c
index 05ea4176fa9b8..5d07973947af1 100644
--- a/sys/pci/if_al.c
+++ b/sys/pci/if_al.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_al.c,v 1.8 1999/08/21 22:10:48 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -91,7 +91,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_al.c,v 1.8 1999/08/21 22:10:48 msmith Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/pci/if_alreg.h b/sys/pci/if_alreg.h
index 6d8e354779f1b..2af519bd35cbd 100644
--- a/sys/pci/if_alreg.h
+++ b/sys/pci/if_alreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_alreg.h,v 1.1 1999/05/21 04:37:24 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/if_ax.c b/sys/pci/if_ax.c
index e9612ee3e2206..da6637f532415 100644
--- a/sys/pci/if_ax.c
+++ b/sys/pci/if_ax.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_ax.c,v 1.11 1999/07/06 19:23:22 des Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -90,7 +90,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_ax.c,v 1.11 1999/07/06 19:23:22 des Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/pci/if_axreg.h b/sys/pci/if_axreg.h
index 0e17fa5aa72fe..669234a807577 100644
--- a/sys/pci/if_axreg.h
+++ b/sys/pci/if_axreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_axreg.h,v 1.6 1999/05/06 15:32:43 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/if_ed_p.c b/sys/pci/if_ed_p.c
index 5f9d2682061a8..023457e37c335 100644
--- a/sys/pci/if_ed_p.c
+++ b/sys/pci/if_ed_p.c
@@ -17,7 +17,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: if_ed_p.c,v 1.16 1999/05/09 17:06:52 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/pci/if_fpa.c b/sys/pci/if_fpa.c
index 7d816b8c8075d..d70628a9e7080 100644
--- a/sys/pci/if_fpa.c
+++ b/sys/pci/if_fpa.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_fpa.c,v 1.11 1999/08/21 06:24:34 msmith Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/pci/if_fxp.c b/sys/pci/if_fxp.c
index 724668c1a328c..ee97515fc1584 100644
--- a/sys/pci/if_fxp.c
+++ b/sys/pci/if_fxp.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_fxp.c,v 1.69 1999/05/09 10:45:54 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/if_fxpreg.h b/sys/pci/if_fxpreg.h
index d6db196244d76..e593608f0c3b8 100644
--- a/sys/pci/if_fxpreg.h
+++ b/sys/pci/if_fxpreg.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_fxpreg.h,v 1.14 1999/02/11 21:47:10 julian Exp $
+ * $FreeBSD$
  */
 
 #define FXP_VENDORID_INTEL	0x8086
diff --git a/sys/pci/if_fxpvar.h b/sys/pci/if_fxpvar.h
index 042d2df962841..7c4717db941e3 100644
--- a/sys/pci/if_fxpvar.h
+++ b/sys/pci/if_fxpvar.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_fxpvar.h,v 1.6 1998/08/02 00:29:15 dg Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/if_lnc_p.c b/sys/pci/if_lnc_p.c
index c92ffc083bc72..33c7212295eed 100644
--- a/sys/pci/if_lnc_p.c
+++ b/sys/pci/if_lnc_p.c
@@ -17,7 +17,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: if_lnc_p.c,v 1.11 1999/07/03 20:17:04 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/pci/if_mx.c b/sys/pci/if_mx.c
index 5dca10c5bc58d..a6fbdb4486cf0 100644
--- a/sys/pci/if_mx.c
+++ b/sys/pci/if_mx.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_mx.c,v 1.21 1999/07/06 19:23:26 des Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -97,7 +97,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_mx.c,v 1.21 1999/07/06 19:23:26 des Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/pci/if_mxreg.h b/sys/pci/if_mxreg.h
index 5755826ee5124..c19e8911f3654 100644
--- a/sys/pci/if_mxreg.h
+++ b/sys/pci/if_mxreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_mxreg.h,v 1.7 1999/05/28 18:43:14 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/if_pn.c b/sys/pci/if_pn.c
index 02d5a4802cf6d..c3744dbe40585 100644
--- a/sys/pci/if_pn.c
+++ b/sys/pci/if_pn.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_pn.c,v 1.24 1999/07/28 02:19:51 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -105,7 +105,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_pn.c,v 1.24 1999/07/28 02:19:51 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/pci/if_pnreg.h b/sys/pci/if_pnreg.h
index 70723530802db..0c567d0178d7f 100644
--- a/sys/pci/if_pnreg.h
+++ b/sys/pci/if_pnreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_pnreg.h,v 1.15 1999/07/28 02:19:52 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index 223f8784c4d90..657aabbf88fed 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_rl.c,v 1.21 1999/08/21 06:24:35 msmith Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -128,7 +128,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_rl.c,v 1.21 1999/08/21 06:24:35 msmith Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/pci/if_rlreg.h b/sys/pci/if_rlreg.h
index f064ef6cd2f5b..5eff4a42b2baa 100644
--- a/sys/pci/if_rlreg.h
+++ b/sys/pci/if_rlreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_rlreg.h,v 1.10 1999/07/22 20:56:49 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c
index e4de7e6956dbb..9a79c26352913 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/if_sf.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_sf.c,v 1.12 1999/07/25 05:10:18 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -119,7 +119,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_sf.c,v 1.12 1999/07/25 05:10:18 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 static struct sf_type sf_devs[] = {
diff --git a/sys/pci/if_sfreg.h b/sys/pci/if_sfreg.h
index 4ead87013a320..e5149aef95b24 100644
--- a/sys/pci/if_sfreg.h
+++ b/sys/pci/if_sfreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_sfreg.h,v 1.4 1999/07/21 03:44:25 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c
index aee546f554bb7..4038967091a8c 100644
--- a/sys/pci/if_sk.c
+++ b/sys/pci/if_sk.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_sk.c,v 1.51 1999/07/14 21:48:19 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -102,7 +102,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_sk.c,v 1.51 1999/07/14 21:48:19 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 static struct sk_type sk_devs[] = {
diff --git a/sys/pci/if_skreg.h b/sys/pci/if_skreg.h
index f03aeff36705f..b0eaa90fce6cd 100644
--- a/sys/pci/if_skreg.h
+++ b/sys/pci/if_skreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_skreg.h,v 1.5 1999/07/23 02:06:56 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/if_sr_p.c b/sys/pci/if_sr_p.c
index 260f5ef0c5d0a..04d0db82c418f 100644
--- a/sys/pci/if_sr_p.c
+++ b/sys/pci/if_sr_p.c
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr_p.c,v 1.9 1999/05/09 17:06:59 peter Exp $
+ * $FreeBSD$
  */
 
 #include "sr.h"
diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c
index 6b5bfd4d0e424..d8085782feb37 100644
--- a/sys/pci/if_ste.c
+++ b/sys/pci/if_ste.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_ste.c,v 1.1 1999/08/21 18:34:44 wpaul Exp $
+ * $FreeBSD$
  */
 
 
@@ -82,7 +82,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_ste.c,v 1.1 1999/08/21 18:34:44 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/pci/if_stereg.h b/sys/pci/if_stereg.h
index 78bc215c002fa..4fe1a0f85de2e 100644
--- a/sys/pci/if_stereg.h
+++ b/sys/pci/if_stereg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_stereg.h,v 1.1 1999/08/21 18:34:45 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c
index c83deefacdd53..5195324852b46 100644
--- a/sys/pci/if_ti.c
+++ b/sys/pci/if_ti.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_ti.c,v 1.14 1999/07/27 13:54:15 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -131,7 +131,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_ti.c,v 1.14 1999/07/27 13:54:15 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/pci/if_tireg.h b/sys/pci/if_tireg.h
index 09b198230eba2..36bbaddff5ad0 100644
--- a/sys/pci/if_tireg.h
+++ b/sys/pci/if_tireg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_tireg.h,v 1.8 1999/07/23 18:46:24 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c
index bfa0e3db1c5c5..80fc4aad8a0d6 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_tl.c,v 1.37 1999/07/23 02:06:56 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -227,7 +227,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_tl.c,v 1.37 1999/07/23 02:06:56 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/pci/if_tlreg.h b/sys/pci/if_tlreg.h
index e9ef74dfede76..b06f5e9a94cb6 100644
--- a/sys/pci/if_tlreg.h
+++ b/sys/pci/if_tlreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_tlreg.h,v 1.12 1999/07/23 02:17:59 wpaul Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/pci/if_tx.c b/sys/pci/if_tx.c
index b7cdc5d3c4c99..6830e10690c7b 100644
--- a/sys/pci/if_tx.c
+++ b/sys/pci/if_tx.c
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $	*/
-/*	$Id: if_tx.c,v 1.30 1999/08/21 06:24:35 msmith Exp $ */
+/* $FreeBSD$ */
 
 /*-
  * Copyright (c) 1997 Semen Ustimenko (semen@iclub.nsu.ru)
diff --git a/sys/pci/if_txvar.h b/sys/pci/if_txvar.h
index 5d0d89570d7d2..5efe056267f15 100644
--- a/sys/pci/if_txvar.h
+++ b/sys/pci/if_txvar.h
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_txvar.h,v 1.3 1998/10/10 04:30:09 jason Exp $	*/
-/*      $Id: if_txvar.h,v 1.2 1999/03/14 08:30:23 semenu Exp $ */
+/* $FreeBSD$ */
 
 /*-
  * Copyright (c) 1997 Semen Ustimenko
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index 2f91c23b2505f..cae329a5761de 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_vr.c,v 1.14 1999/08/10 17:15:10 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -100,7 +100,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_vr.c,v 1.14 1999/08/10 17:15:10 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/pci/if_vrreg.h b/sys/pci/if_vrreg.h
index e1e4ae6d1cfc7..fef8e48fc3908 100644
--- a/sys/pci/if_vrreg.h
+++ b/sys/pci/if_vrreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_vrreg.h,v 1.4 1999/05/06 15:32:50 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index 1ea58f4144bf4..fb635b2cd5e96 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_wb.c,v 1.13 1999/07/11 00:56:07 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -129,7 +129,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: if_wb.c,v 1.13 1999/07/11 00:56:07 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/pci/if_wbreg.h b/sys/pci/if_wbreg.h
index ed8b35afb2cc9..5411339fd4018 100644
--- a/sys/pci/if_wbreg.h
+++ b/sys/pci/if_wbreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_wbreg.h,v 1.4 1999/07/11 00:56:07 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index be5b83ea5d180..04d76a7a083c8 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_xl.c,v 1.50 1999/08/02 21:57:57 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -163,7 +163,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_xl.c,v 1.50 1999/08/02 21:57:57 wpaul Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/sys/pci/if_xlreg.h b/sys/pci/if_xlreg.h
index c74824612f03c..b50f068e3f42f 100644
--- a/sys/pci/if_xlreg.h
+++ b/sys/pci/if_xlreg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_xlreg.h,v 1.17 1999/05/30 18:09:17 wpaul Exp $
+ * $FreeBSD$
  */
 
 #define XL_EE_READ	0x0080	/* read, 5 bit address */
diff --git a/sys/pci/intpm.c b/sys/pci/intpm.c
index 7163d37998edc..e90466b45621a 100644
--- a/sys/pci/intpm.c
+++ b/sys/pci/intpm.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: intpm.c,v 1.12 1999/07/24 19:13:54 nsouch Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/pci/intpmreg.h b/sys/pci/intpmreg.h
index fdadef07e1515..73816e7748d5a 100644
--- a/sys/pci/intpmreg.h
+++ b/sys/pci/intpmreg.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*Register Difinition for Intel Chipset with ACPI Support*/
diff --git a/sys/pci/isp_pci.c b/sys/pci/isp_pci.c
index 8fd49bbfd562a..1aa31953b36bb 100644
--- a/sys/pci/isp_pci.c
+++ b/sys/pci/isp_pci.c
@@ -1,4 +1,4 @@
-/* $Id: isp_pci.c,v 1.30 1999/08/16 19:52:29 mjacob Exp $ */
+/* $FreeBSD$ */
 /*
  * PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
  * FreeBSD Version.
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index 03256db1e1292..6b166b300af0c 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: ncr.c,v 1.149 1999/06/15 13:14:56 des Exp $
+** $FreeBSD$
 **
 **  Device driver for the   NCR 53C8XX   PCI-SCSI-Controller Family.
 **
@@ -1360,7 +1360,7 @@ static	void	ncr_attach	(pcici_t tag, int unit);
 
 #if !defined(lint)
 static const char ident[] =
-	"\n$Id: ncr.c,v 1.149 1999/06/15 13:14:56 des Exp $\n";
+	"\n$FreeBSD$\n";
 #endif
 
 static const u_long	ncr_version = NCR_VERSION	* 11
diff --git a/sys/pci/ncrreg.h b/sys/pci/ncrreg.h
index 2b5c92572dce2..fcc72124377f3 100644
--- a/sys/pci/ncrreg.h
+++ b/sys/pci/ncrreg.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: ncrreg.h,v 1.11 1997/08/31 19:42:31 se Exp $
+** $FreeBSD$
 **
 **  Device driver for the   NCR 53C810   PCI-SCSI-Controller.
 **
diff --git a/sys/pci/pci.c b/sys/pci/pci.c
index 75f41e87c72b3..214d6f96b80ff 100644
--- a/sys/pci/pci.c
+++ b/sys/pci/pci.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pci.c,v 1.114 1999/07/29 01:03:03 mdodd Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/pci/pci_compat.c b/sys/pci/pci_compat.c
index db4d56afa76ea..c007dc5770631 100644
--- a/sys/pci/pci_compat.c
+++ b/sys/pci/pci_compat.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pci_compat.c,v 1.30 1999/07/03 20:17:08 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/pci/pci_if.m b/sys/pci/pci_if.m
index b2fa6758fef6a..95b0081ca32bd 100644
--- a/sys/pci/pci_if.m
+++ b/sys/pci/pci_if.m
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id$
+# $FreeBSD$
 #
 
 INTERFACE pci;
diff --git a/sys/pci/pcic_p.c b/sys/pci/pcic_p.c
index e596a75fbce44..5b23c5e57c27e 100644
--- a/sys/pci/pcic_p.c
+++ b/sys/pci/pcic_p.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcic_p.c,v 1.12 1999/05/09 17:07:11 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/pci/pcic_p.h b/sys/pci/pcic_p.h
index 47934f3d02a90..bd8e06c79e45a 100644
--- a/sys/pci/pcic_p.h
+++ b/sys/pci/pcic_p.h
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcic_p.h,v 1.5 1999/04/01 15:28:10 nsayer Exp $
+ * $FreeBSD$
  */
 
 /* PCI/CardBus Device IDs */
diff --git a/sys/pci/pcireg.h b/sys/pci/pcireg.h
index 9c0dba09331d2..f90df10e14de0 100644
--- a/sys/pci/pcireg.h
+++ b/sys/pci/pcireg.h
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcireg.h,v 1.20 1998/10/07 03:40:51 gibbs Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/pci/pcisupport.c b/sys/pci/pcisupport.c
index a5882df530b8b..e883b5f2f286a 100644
--- a/sys/pci/pcisupport.c
+++ b/sys/pci/pcisupport.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcisupport.c,v 1.124 1999/08/09 21:11:44 mdodd Exp $
+** $FreeBSD$
 **
 **  Device driver for DEC/INTEL PCI chipsets.
 **
diff --git a/sys/pci/pcivar.h b/sys/pci/pcivar.h
index f1c6f5e4d7447..ae4958dbf2654 100644
--- a/sys/pci/pcivar.h
+++ b/sys/pci/pcivar.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcivar.h,v 1.33 1999/05/20 15:33:33 gallatin Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/pci/simos.c b/sys/pci/simos.c
index 7a9954b14097e..2a9a706b311be 100644
--- a/sys/pci/simos.c
+++ b/sys/pci/simos.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: simos.c,v 1.5 1999/05/06 20:16:39 ken Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/pci/simos.h b/sys/pci/simos.h
index 46093547cf0d4..e703074e58c3d 100644
--- a/sys/pci/simos.h
+++ b/sys/pci/simos.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/ti_fw.h b/sys/pci/ti_fw.h
index 51bc01498ad7d..8d4ae4dd1ea78 100644
--- a/sys/pci/ti_fw.h
+++ b/sys/pci/ti_fw.h
@@ -2,7 +2,7 @@
  * Firmware for Alteon Tigon 1 chip.
  * Generated by genfw.c
  *
- *      $Id$
+ * $FreeBSD$
  */
 static int tigonFwReleaseMajor = 0xc;
 static int tigonFwReleaseMinor = 0x3;
diff --git a/sys/pci/ti_fw2.h b/sys/pci/ti_fw2.h
index e2ee31f7e4c93..e46ac9640143c 100644
--- a/sys/pci/ti_fw2.h
+++ b/sys/pci/ti_fw2.h
@@ -3,7 +3,7 @@
  * Built on Thu Jul 15 17:08:34 1999 by wpaul@xylophone
  * OS: FreeBSD 3.2-RELEASE
  *
- *	$Id: genfw.c,v 1.2 1999/03/18 17:16:43 wpaul Exp $
+ * $FreeBSD$
  */
 static int tigon2FwReleaseMajor = 0xc;
 static int tigon2FwReleaseMinor = 0x3;
diff --git a/sys/pci/xmaciireg.h b/sys/pci/xmaciireg.h
index fe8946bdabdb8..f649e93a044e8 100644
--- a/sys/pci/xmaciireg.h
+++ b/sys/pci/xmaciireg.h
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: xmaciireg.h,v 1.10 1999/07/09 03:35:12 wpaul Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/pci/xrpu.c b/sys/pci/xrpu.c
index e34e3c2e65e7f..1b56e6bb2787f 100644
--- a/sys/pci/xrpu.c
+++ b/sys/pci/xrpu.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: xrpu.c,v 1.15 1999/07/13 08:15:22 phk Exp $
+ * $FreeBSD$
  *
  * A very simple device driver for PCI cards based on Xilinx 6200 series
  * FPGA/RPU devices.  Current Functionality is to allow you to open and
diff --git a/sys/posix4/aio.h b/sys/posix4/aio.h
index 73319ece7920d..b96e9eb26372f 100644
--- a/sys/posix4/aio.h
+++ b/sys/posix4/aio.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: aio.h,v 1.3 1998/03/23 14:05:25 bde Exp $
+ * $FreeBSD$
  */
 
 /* aio.h: P1003.1B-1993 Asynchronous I/O */
diff --git a/sys/powerpc/aim/vm_machdep.c b/sys/powerpc/aim/vm_machdep.c
index 4f92cf697bfd5..2f0dabb948050 100644
--- a/sys/powerpc/aim/vm_machdep.c
+++ b/sys/powerpc/aim/vm_machdep.c
@@ -38,7 +38,7 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.19 1999/08/05 23:38:13 jdp Exp $
+ * $FreeBSD$
  */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/powerpc/include/_limits.h b/sys/powerpc/include/_limits.h
index fe6041b4c4b7e..0d258ff9d94c3 100644
--- a/sys/powerpc/include/_limits.h
+++ b/sys/powerpc/include/_limits.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $Id: limits.h,v 1.12 1999/05/20 23:33:35 ache Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/powerpc/include/bootinfo.h b/sys/powerpc/include/bootinfo.h
index cd45e408d85f7..86b7e7a729bb1 100644
--- a/sys/powerpc/include/bootinfo.h
+++ b/sys/powerpc/include/bootinfo.h
@@ -1,4 +1,4 @@
-/* $Id: bootinfo.h,v 1.3 1998/10/14 09:53:24 peter Exp $ */
+/* $FreeBSD$ */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
diff --git a/sys/powerpc/include/clock.h b/sys/powerpc/include/clock.h
index e1915230a842b..f243f8b203348 100644
--- a/sys/powerpc/include/clock.h
+++ b/sys/powerpc/include/clock.h
@@ -3,7 +3,7 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- *	$Id: clock.h,v 1.2 1998/07/22 08:26:23 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_CLOCK_H_
diff --git a/sys/powerpc/include/limits.h b/sys/powerpc/include/limits.h
index fe6041b4c4b7e..0d258ff9d94c3 100644
--- a/sys/powerpc/include/limits.h
+++ b/sys/powerpc/include/limits.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $Id: limits.h,v 1.12 1999/05/20 23:33:35 ache Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_LIMITS_H_
diff --git a/sys/powerpc/include/md_var.h b/sys/powerpc/include/md_var.h
index 94e87ffd7d838..42d40f3f2dfa0 100644
--- a/sys/powerpc/include/md_var.h
+++ b/sys/powerpc/include/md_var.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: md_var.h,v 1.6 1999/07/01 21:58:38 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_MD_VAR_H_
diff --git a/sys/powerpc/include/ptrace.h b/sys/powerpc/include/ptrace.h
index 2c43a2eef8d4e..55a26fd636ad3 100644
--- a/sys/powerpc/include/ptrace.h
+++ b/sys/powerpc/include/ptrace.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $Id: ptrace.h,v 1.6 1998/05/19 00:00:12 tegge Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_PTRACE_H_
diff --git a/sys/powerpc/powerpc/elf_machdep.c b/sys/powerpc/powerpc/elf_machdep.c
index 646e3536573e4..5582fcb1337de 100644
--- a/sys/powerpc/powerpc/elf_machdep.c
+++ b/sys/powerpc/powerpc/elf_machdep.c
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $Id: elf_machdep.c,v 1.5 1999/07/16 09:16:11 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/powerpc/powerpc/genassym.c b/sys/powerpc/powerpc/genassym.c
index 945f537aaddf6..dc838f71ace74 100644
--- a/sys/powerpc/powerpc/genassym.c
+++ b/sys/powerpc/powerpc/genassym.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$Id: genassym.c,v 1.7 1999/06/28 09:15:35 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/powerpc/powerpc/procfs_machdep.c b/sys/powerpc/powerpc/procfs_machdep.c
index cfaa023fd01fe..000eb02a0a7f9 100644
--- a/sys/powerpc/powerpc/procfs_machdep.c
+++ b/sys/powerpc/powerpc/procfs_machdep.c
@@ -37,7 +37,7 @@
  *	@(#)procfs_machdep.c	8.3 (Berkeley) 1/27/94
  *
  * From:
- *	$Id: procfs_machdep.c,v 1.2 1998/09/14 22:43:19 jdp Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/powerpc/powerpc/vm_machdep.c b/sys/powerpc/powerpc/vm_machdep.c
index 4f92cf697bfd5..2f0dabb948050 100644
--- a/sys/powerpc/powerpc/vm_machdep.c
+++ b/sys/powerpc/powerpc/vm_machdep.c
@@ -38,7 +38,7 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.19 1999/08/05 23:38:13 jdp Exp $
+ * $FreeBSD$
  */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/svr4/Makefile b/sys/svr4/Makefile
index d8fd59b7fb3cb..670fccb6a6688 100644
--- a/sys/svr4/Makefile
+++ b/sys/svr4/Makefile
@@ -1,6 +1,6 @@
 # Makefile for syscall tables
 #
-# $Id: Makefile,v 1.3 1997/03/29 11:17:26 peter Exp $
+# $FreeBSD$
 
 all:
 	@echo "make svr4_sysent.c only"
diff --git a/sys/svr4/imgact_svr4.c b/sys/svr4/imgact_svr4.c
index 5fcfcb5bafcae..707e7e4d3ac4d 100644
--- a/sys/svr4/imgact_svr4.c
+++ b/sys/svr4/imgact_svr4.c
@@ -29,7 +29,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/svr4/svr4.h b/sys/svr4/svr4.h
index a42d49d4f9d44..52910bf349c36 100644
--- a/sys/svr4/svr4.h
+++ b/sys/svr4/svr4.h
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #if !defined(_SVR4_H)
diff --git a/sys/svr4/svr4_acl.h b/sys/svr4/svr4_acl.h
index f1a405f2fd6a8..6d9454f65ecd3 100644
--- a/sys/svr4/svr4_acl.h
+++ b/sys/svr4/svr4_acl.h
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 #ifndef	_SVR4_ACL_H_
 #define	_SVR4_ACL_H_
diff --git a/sys/svr4/svr4_dirent.h b/sys/svr4/svr4_dirent.h
index 26ee8164aeb0f..2440782278889 100644
--- a/sys/svr4/svr4_dirent.h
+++ b/sys/svr4/svr4_dirent.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_DIRENT_H_
diff --git a/sys/svr4/svr4_errno.h b/sys/svr4/svr4_errno.h
index 50dd46a43127c..cc39929acfd5f 100644
--- a/sys/svr4/svr4_errno.h
+++ b/sys/svr4/svr4_errno.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_ERRNO_H_
diff --git a/sys/svr4/svr4_exec.h b/sys/svr4/svr4_exec.h
index 301915940bd3a..716dad18924a7 100644
--- a/sys/svr4/svr4_exec.h
+++ b/sys/svr4/svr4_exec.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_EXEC_H_
diff --git a/sys/svr4/svr4_fcntl.c b/sys/svr4/svr4_fcntl.c
index add04e382f73a..60b975966a4b5 100644
--- a/sys/svr4/svr4_fcntl.c
+++ b/sys/svr4/svr4_fcntl.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_fcntl.c,v 1.3 1999/07/30 12:45:15 newton Exp $
+ * $FreeBSD$
  */
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/svr4/svr4_fcntl.h b/sys/svr4/svr4_fcntl.h
index 6ee21fae8339c..615e09c219fbd 100644
--- a/sys/svr4/svr4_fcntl.h
+++ b/sys/svr4/svr4_fcntl.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_FCNTL_H_
diff --git a/sys/svr4/svr4_filio.c b/sys/svr4/svr4_filio.c
index 9dfeced92f6b7..0be9f221c7bc2 100644
--- a/sys/svr4/svr4_filio.c
+++ b/sys/svr4/svr4_filio.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/svr4/svr4_filio.h b/sys/svr4/svr4_filio.h
index 254e2da813c73..37184cb72610b 100644
--- a/sys/svr4/svr4_filio.h
+++ b/sys/svr4/svr4_filio.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_FILIO_H_
diff --git a/sys/svr4/svr4_fuser.h b/sys/svr4/svr4_fuser.h
index bc726c12cefa7..25cdcf13e0be3 100644
--- a/sys/svr4/svr4_fuser.h
+++ b/sys/svr4/svr4_fuser.h
@@ -1,5 +1,5 @@
 /*
- *	$Id$
+ * $FreeBSD$
  *	Derived from:
  *	$NetBSD: svr4_fuser.h,v 1.4 1998/09/04 19:54:38 christos Exp $	 */
 
diff --git a/sys/svr4/svr4_hrt.h b/sys/svr4/svr4_hrt.h
index 8fc0231f46459..c160b8eeb6e9f 100644
--- a/sys/svr4/svr4_hrt.h
+++ b/sys/svr4/svr4_hrt.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_HRT_H_
diff --git a/sys/svr4/svr4_ioctl.c b/sys/svr4/svr4_ioctl.c
index 02c120217636c..401c58b2a9602 100644
--- a/sys/svr4/svr4_ioctl.c
+++ b/sys/svr4/svr4_ioctl.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/svr4/svr4_ioctl.h b/sys/svr4/svr4_ioctl.h
index f95e5ee534539..a5c6a53241811 100644
--- a/sys/svr4/svr4_ioctl.h
+++ b/sys/svr4/svr4_ioctl.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_IOCTL_H_
diff --git a/sys/svr4/svr4_ipc.c b/sys/svr4/svr4_ipc.c
index 1f9b7573cc72d..f884fa16c4edc 100644
--- a/sys/svr4/svr4_ipc.c
+++ b/sys/svr4/svr4_ipc.c
@@ -1,5 +1,5 @@
 /*
- *	$Id$
+ * $FreeBSD$
  *	Derived from:
  *	$NetBSD: svr4_ipc.c,v 1.7 1998/10/19 22:43:00 tron Exp $	*/
 
diff --git a/sys/svr4/svr4_ipc.h b/sys/svr4/svr4_ipc.h
index 56d7f5572be7b..6aadb7e050eca 100644
--- a/sys/svr4/svr4_ipc.h
+++ b/sys/svr4/svr4_ipc.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SVR4_IPC_H_
diff --git a/sys/svr4/svr4_misc.c b/sys/svr4/svr4_misc.c
index 35aa8e603e6e4..9535cba8972b7 100644
--- a/sys/svr4/svr4_misc.c
+++ b/sys/svr4/svr4_misc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_misc.c,v 1.4 1999/07/30 12:45:16 newton Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/svr4/svr4_mman.h b/sys/svr4/svr4_mman.h
index 77500fad8a3d2..db7c3dacef5f1 100644
--- a/sys/svr4/svr4_mman.h
+++ b/sys/svr4/svr4_mman.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SVR4_MMAN_H_
diff --git a/sys/svr4/svr4_resource.c b/sys/svr4/svr4_resource.c
index 32717998d72e2..7c39f44b3a1ed 100644
--- a/sys/svr4/svr4_resource.c
+++ b/sys/svr4/svr4_resource.c
@@ -39,7 +39,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/svr4/svr4_resource.h b/sys/svr4/svr4_resource.h
index caab421cd6c6d..3512df387674d 100644
--- a/sys/svr4/svr4_resource.h
+++ b/sys/svr4/svr4_resource.h
@@ -38,7 +38,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/svr4/svr4_siginfo.h b/sys/svr4/svr4_siginfo.h
index 0f4c3e28f7cca..be898374dc2be 100644
--- a/sys/svr4/svr4_siginfo.h
+++ b/sys/svr4/svr4_siginfo.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_SIGINFO_H_
diff --git a/sys/svr4/svr4_signal.c b/sys/svr4/svr4_signal.c
index 2e1e088f902fb..b1239871942d2 100644
--- a/sys/svr4/svr4_signal.c
+++ b/sys/svr4/svr4_signal.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/svr4/svr4_signal.h b/sys/svr4/svr4_signal.h
index 0b02985068d4d..8fb861d201474 100644
--- a/sys/svr4/svr4_signal.h
+++ b/sys/svr4/svr4_signal.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_SIGNAL_H_
diff --git a/sys/svr4/svr4_socket.c b/sys/svr4/svr4_socket.c
index f42690071599a..e2eafa304e5d2 100644
--- a/sys/svr4/svr4_socket.c
+++ b/sys/svr4/svr4_socket.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_socket.c,v 1.2 1999/07/30 12:45:17 newton Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/svr4/svr4_socket.h b/sys/svr4/svr4_socket.h
index e7ee86b9b5f8b..96e3582738fb9 100644
--- a/sys/svr4/svr4_socket.h
+++ b/sys/svr4/svr4_socket.h
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_socket.h,v 1.2 1999/07/30 12:45:18 newton Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SVR4_SOCKET_H_
diff --git a/sys/svr4/svr4_sockio.c b/sys/svr4/svr4_sockio.c
index c0c9767bc6d6c..7d6184612762e 100644
--- a/sys/svr4/svr4_sockio.c
+++ b/sys/svr4/svr4_sockio.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/svr4/svr4_sockio.h b/sys/svr4/svr4_sockio.h
index f363caaddcbbf..dd4e220c9f488 100644
--- a/sys/svr4/svr4_sockio.h
+++ b/sys/svr4/svr4_sockio.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_SOCKIO_H_
diff --git a/sys/svr4/svr4_sockmod.h b/sys/svr4/svr4_sockmod.h
index 36e0a8a24b606..927ba0d283675 100644
--- a/sys/svr4/svr4_sockmod.h
+++ b/sys/svr4/svr4_sockmod.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_SOCKMOD_H_
diff --git a/sys/svr4/svr4_stat.c b/sys/svr4/svr4_stat.c
index 2b6755127dd0d..9ffcbc58d7542 100644
--- a/sys/svr4/svr4_stat.c
+++ b/sys/svr4/svr4_stat.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/svr4/svr4_stat.h b/sys/svr4/svr4_stat.h
index 082cb409f7868..7eeff44f30acf 100644
--- a/sys/svr4/svr4_stat.h
+++ b/sys/svr4/svr4_stat.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_STAT_H_
diff --git a/sys/svr4/svr4_statvfs.h b/sys/svr4/svr4_statvfs.h
index cc904abb89e3e..b3bf473a1b52c 100644
--- a/sys/svr4/svr4_statvfs.h
+++ b/sys/svr4/svr4_statvfs.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_STATVFS_H_
diff --git a/sys/svr4/svr4_stream.c b/sys/svr4/svr4_stream.c
index 41709258bd8ce..4ced1bc07f3a6 100644
--- a/sys/svr4/svr4_stream.c
+++ b/sys/svr4/svr4_stream.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_stream.c,v 1.2 1999/07/30 12:45:18 newton Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/svr4/svr4_stropts.h b/sys/svr4/svr4_stropts.h
index 52badbb502ef1..2fa14a1e988a7 100644
--- a/sys/svr4/svr4_stropts.h
+++ b/sys/svr4/svr4_stropts.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_STROPTS_H_
diff --git a/sys/svr4/svr4_sysconfig.h b/sys/svr4/svr4_sysconfig.h
index 331fa7ebaa0fc..874c5653e634d 100644
--- a/sys/svr4/svr4_sysconfig.h
+++ b/sys/svr4/svr4_sysconfig.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_SYSCONFIG_H_
diff --git a/sys/svr4/svr4_systeminfo.h b/sys/svr4/svr4_systeminfo.h
index 0e05a658d0b7e..40bc2b85d7570 100644
--- a/sys/svr4/svr4_systeminfo.h
+++ b/sys/svr4/svr4_systeminfo.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_SYSTEMINFO_H_
diff --git a/sys/svr4/svr4_sysvec.c b/sys/svr4/svr4_sysvec.c
index 95427ec67a94a..099bb9c4dfa9f 100644
--- a/sys/svr4/svr4_sysvec.c
+++ b/sys/svr4/svr4_sysvec.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_sysvec.c,v 1.4 1999/07/30 12:45:19 newton Exp $
+ * $FreeBSD$
  */
 
 /* XXX we use functions that might not exist. */
diff --git a/sys/svr4/svr4_termios.c b/sys/svr4/svr4_termios.c
index 45525a2306077..450c0847a99e6 100644
--- a/sys/svr4/svr4_termios.c
+++ b/sys/svr4/svr4_termios.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/svr4/svr4_termios.h b/sys/svr4/svr4_termios.h
index f7eddd443667c..8afa4f321bc36 100644
--- a/sys/svr4/svr4_termios.h
+++ b/sys/svr4/svr4_termios.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_TERMIOS_H_
diff --git a/sys/svr4/svr4_time.h b/sys/svr4/svr4_time.h
index cc9d7a7a18651..3d61771fc9045 100644
--- a/sys/svr4/svr4_time.h
+++ b/sys/svr4/svr4_time.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_TIME_H_
diff --git a/sys/svr4/svr4_timod.h b/sys/svr4/svr4_timod.h
index 7d98e05d782ca..f0c508f511b8d 100644
--- a/sys/svr4/svr4_timod.h
+++ b/sys/svr4/svr4_timod.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_TIMOD_H_
diff --git a/sys/svr4/svr4_ttold.c b/sys/svr4/svr4_ttold.c
index ac4c1d62c8ef5..d597691cc6998 100644
--- a/sys/svr4/svr4_ttold.c
+++ b/sys/svr4/svr4_ttold.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/svr4/svr4_ttold.h b/sys/svr4/svr4_ttold.h
index 81ea51448fd54..c578170a1ef9d 100644
--- a/sys/svr4/svr4_ttold.h
+++ b/sys/svr4/svr4_ttold.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_TTOLD_H_
diff --git a/sys/svr4/svr4_types.h b/sys/svr4/svr4_types.h
index 2aed74e4ff845..410746b6adc9c 100644
--- a/sys/svr4/svr4_types.h
+++ b/sys/svr4/svr4_types.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_TYPES_H_
diff --git a/sys/svr4/svr4_ucontext.h b/sys/svr4/svr4_ucontext.h
index c37865283da69..04bebe6eb81e6 100644
--- a/sys/svr4/svr4_ucontext.h
+++ b/sys/svr4/svr4_ucontext.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_UCONTEXT_H_
diff --git a/sys/svr4/svr4_ulimit.h b/sys/svr4/svr4_ulimit.h
index bd83d721abbd5..0735d42f722f0 100644
--- a/sys/svr4/svr4_ulimit.h
+++ b/sys/svr4/svr4_ulimit.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_ULIMIT_H_
diff --git a/sys/svr4/svr4_ustat.h b/sys/svr4/svr4_ustat.h
index 3c805a4feb43b..0033c96bae0d8 100644
--- a/sys/svr4/svr4_ustat.h
+++ b/sys/svr4/svr4_ustat.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_USTAT_H_
diff --git a/sys/svr4/svr4_util.h b/sys/svr4/svr4_util.h
index a2f28e340416d..629edd69cd4a3 100644
--- a/sys/svr4/svr4_util.h
+++ b/sys/svr4/svr4_util.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id: svr4_util.h,v 1.2 1999/07/30 12:45:21 newton Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_UTIL_H_
diff --git a/sys/svr4/svr4_utsname.h b/sys/svr4/svr4_utsname.h
index e104778c9d17d..a3714c9b1c10b 100644
--- a/sys/svr4/svr4_utsname.h
+++ b/sys/svr4/svr4_utsname.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_UTSNAME_H_
diff --git a/sys/svr4/svr4_wait.h b/sys/svr4/svr4_wait.h
index 2945c19482757..9a92c0114c1c1 100644
--- a/sys/svr4/svr4_wait.h
+++ b/sys/svr4/svr4_wait.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SVR4_WAIT_H_
diff --git a/sys/svr4/syscalls.conf b/sys/svr4/syscalls.conf
index 5c01a85cad74a..46f7bd3df7be0 100644
--- a/sys/svr4/syscalls.conf
+++ b/sys/svr4/syscalls.conf
@@ -1,4 +1,4 @@
-# $Id: syscalls.conf,v 1.4 1998/03/13 19:13:54 jb Exp $
+# $FreeBSD$
 sysnames="svr4_syscallnames.c"
 sysproto="svr4_proto.h"
 sysproto_h=_SVR4_SYSPROTO_H_
diff --git a/sys/svr4/syscalls.master b/sys/svr4/syscalls.master
index 703120d7d2369..43e8f4886c68a 100644
--- a/sys/svr4/syscalls.master
+++ b/sys/svr4/syscalls.master
@@ -20,7 +20,7 @@
 ;	OBSOL	obsolete, not included in system, only specifies name
 ;	UNIMPL	not implemented, placeholder only
 ;
-; $Id: syscalls.master,v 1.2 1999/07/30 12:45:21 newton Exp $
+; $FreeBSD$
 ;
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/sys/sys/_posix.h b/sys/sys/_posix.h
index b64222051d803..ea0436a93b542 100644
--- a/sys/sys/_posix.h
+++ b/sys/sys/_posix.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: _posix.h,v 1.3 1998/10/16 03:55:01 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/sys/_sigset.h b/sys/sys/_sigset.h
index 471baa97b7542..4a0fee85f7f16 100644
--- a/sys/sys/_sigset.h
+++ b/sys/sys/_sigset.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.4 (Berkeley) 5/4/95
- * $Id: signal.h,v 1.14 1998/08/05 09:04:36 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_SIGNAL_H_
diff --git a/sys/sys/acct.h b/sys/sys/acct.h
index e38675d1ae5a0..d59d974cb41ee 100644
--- a/sys/sys/acct.h
+++ b/sys/sys/acct.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)acct.h	8.4 (Berkeley) 1/9/95
- * $Id: acct.h,v 1.9 1998/02/01 20:08:35 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_ACCT_H_
diff --git a/sys/sys/aio.h b/sys/sys/aio.h
index 251d354272d54..68a5698503d16 100644
--- a/sys/sys/aio.h
+++ b/sys/sys/aio.h
@@ -13,7 +13,7 @@
  * bad that happens because of using this software isn't the responsibility
  * of the author.  This software is distributed AS-IS.
  *
- * $Id: aio.h,v 1.9 1999/01/17 22:33:08 dt Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_AIO_H_
diff --git a/sys/sys/bio.h b/sys/sys/bio.h
index 609a37072f9f5..f84498589ed8c 100644
--- a/sys/sys/bio.h
+++ b/sys/sys/bio.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)buf.h	8.9 (Berkeley) 3/30/95
- * $Id: buf.h,v 1.77 1999/07/09 16:41:18 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_BUF_H_
diff --git a/sys/sys/blist.h b/sys/sys/blist.h
index 05d82398d1b61..a26932cae89fb 100644
--- a/sys/sys/blist.h
+++ b/sys/sys/blist.h
@@ -24,7 +24,7 @@
  *		that.  Managing something like 512MB worth of 4K blocks 
  *		eats around 32 KBytes of memory. 
  *
- *	$Id: blist.h,v Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_BLIST_H_
diff --git a/sys/sys/buf.h b/sys/sys/buf.h
index 609a37072f9f5..f84498589ed8c 100644
--- a/sys/sys/buf.h
+++ b/sys/sys/buf.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)buf.h	8.9 (Berkeley) 3/30/95
- * $Id: buf.h,v 1.77 1999/07/09 16:41:18 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_BUF_H_
diff --git a/sys/sys/bus.h b/sys/sys/bus.h
index f02b3190d84c6..03a644975cce5 100644
--- a/sys/sys/bus.h
+++ b/sys/sys/bus.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bus.h,v 1.21 1999/07/24 09:34:10 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_BUS_H_
diff --git a/sys/sys/bus_dma.h b/sys/sys/bus_dma.h
index 28e80ba2b89aa..b6a9795a5ae5b 100644
--- a/sys/sys/bus_dma.h
+++ b/sys/sys/bus_dma.h
@@ -67,7 +67,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/* $Id: bus.h,v 1.4 1998/09/29 09:06:00 bde Exp $ */
+/* $FreeBSD$ */
 
 #ifndef _I386_BUS_H_
 #define _I386_BUS_H_
diff --git a/sys/sys/bus_private.h b/sys/sys/bus_private.h
index f3539a3d4dac0..27b0a6c0e2970 100644
--- a/sys/sys/bus_private.h
+++ b/sys/sys/bus_private.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bus_private.h,v 1.8 1999/05/14 09:13:39 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_BUS_PRIVATE_H_
diff --git a/sys/sys/callout.h b/sys/sys/callout.h
index ddb830b866d73..971ac9f880795 100644
--- a/sys/sys/callout.h
+++ b/sys/sys/callout.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)callout.h	8.2 (Berkeley) 1/21/94
- * $Id: callout.h,v 1.11 1998/01/11 00:43:51 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_CALLOUT_H_
diff --git a/sys/sys/ccdvar.h b/sys/sys/ccdvar.h
index 862419dc3ffc0..82ac51d9b5593 100644
--- a/sys/sys/ccdvar.h
+++ b/sys/sys/ccdvar.h
@@ -1,4 +1,4 @@
-/* $Id: ccdvar.h,v 1.7 1998/09/15 10:07:26 gibbs Exp $ */
+/* $FreeBSD$ */
 
 /*	$NetBSD: ccdvar.h,v 1.7.2.1 1995/10/12 21:30:18 thorpej Exp $	*/
 
diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h
index 587e7d72ecac7..f062c772da778 100644
--- a/sys/sys/cdefs.h
+++ b/sys/sys/cdefs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cdefs.h	8.8 (Berkeley) 1/9/95
- * $Id: cdefs.h,v 1.23 1998/10/29 04:41:24 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_CDEFS_H_
diff --git a/sys/sys/cdio.h b/sys/sys/cdio.h
index 516e67abe0b84..dbb0f29f9abc6 100644
--- a/sys/sys/cdio.h
+++ b/sys/sys/cdio.h
@@ -1,7 +1,7 @@
 /*
  * 16 Feb 93	Julian Elischer	(julian@dialix.oz.au)
  *
- *	$Id: cdio.h,v 1.18 1998/06/08 09:47:47 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/sys/chio.h b/sys/sys/chio.h
index 3e0cea197bacf..7a2403f27dd36 100644
--- a/sys/sys/chio.h
+++ b/sys/sys/chio.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: chio.h,v 1.12 1998/09/15 10:07:26 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_CHIO_H_
diff --git a/sys/sys/clist.h b/sys/sys/clist.h
index 5e87f2b11cddb..d1c22fa3d5999 100644
--- a/sys/sys/clist.h
+++ b/sys/sys/clist.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)clist.h	8.1 (Berkeley) 6/4/93
- * $Id: clist.h,v 1.7 1997/02/22 09:44:58 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_CLIST_H_
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index 00645fb949b47..4e5a94a5aba8f 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.h	8.5 (Berkeley) 1/9/95
- * $Id: conf.h,v 1.78 1999/08/25 22:50:12 julian Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_CONF_H_
diff --git a/sys/sys/cons.h b/sys/sys/cons.h
index a626091976ec2..b6414a1244ca9 100644
--- a/sys/sys/cons.h
+++ b/sys/sys/cons.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.h	7.2 (Berkeley) 5/9/91
- *	$Id: cons.h,v 1.20 1999/06/22 14:12:55 yokota Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_CONS_H_
diff --git a/sys/sys/consio.h b/sys/sys/consio.h
index abc9c1fca1e8c..d121457cfc66a 100644
--- a/sys/sys/consio.h
+++ b/sys/sys/consio.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: console.h,v 1.45 1999/03/10 10:36:47 yokota Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_CONSIO_H_
diff --git a/sys/sys/copyright.h b/sys/sys/copyright.h
index 18c0b246ec909..becc5474d370c 100644
--- a/sys/sys/copyright.h
+++ b/sys/sys/copyright.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * 	$Id: copyright.h,v 1.6 1999/02/10 13:09:09 kato Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/sys/devfsext.h b/sys/sys/devfsext.h
index fd66d85b4a6df..478adc0a4a95e 100644
--- a/sys/sys/devfsext.h
+++ b/sys/sys/devfsext.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * $Id: devfsext.h,v 1.23 1999/08/08 18:42:59 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_DEVFSEXT_H_
diff --git a/sys/sys/device.h b/sys/sys/device.h
index 5425d7728ad5f..fc5ce337439e8 100644
--- a/sys/sys/device.h
+++ b/sys/sys/device.h
@@ -40,7 +40,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)device.h	8.2 (Berkeley) 2/17/94
- * $Id: device.h,v 1.7 1997/09/21 22:09:03 gibbs Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_DEVICE_H_
diff --git a/sys/sys/devicestat.h b/sys/sys/devicestat.h
index c94b8ce235807..8887744ea3064 100644
--- a/sys/sys/devicestat.h
+++ b/sys/sys/devicestat.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: devicestat.h,v 1.3 1998/11/14 21:58:41 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _DEVICESTAT_H
diff --git a/sys/sys/dir.h b/sys/sys/dir.h
index bea51b01eb0be..670850ac37efa 100644
--- a/sys/sys/dir.h
+++ b/sys/sys/dir.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dir.h	8.2 (Berkeley) 1/4/94
- * $Id: dir.h,v 1.4 1997/02/22 09:45:01 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_DIR_H_
diff --git a/sys/sys/dirent.h b/sys/sys/dirent.h
index 33b2d7f91865d..19db37ba43e79 100644
--- a/sys/sys/dirent.h
+++ b/sys/sys/dirent.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dirent.h	8.3 (Berkeley) 8/10/94
- * $Id: dirent.h,v 1.8 1997/04/10 13:54:19 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_DIRENT_H_
diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index 1e3865c9000a7..e664e26743e76 100644
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
- * $Id: disklabel.h,v 1.41 1999/08/11 03:02:05 imp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_DISKLABEL_H_
diff --git a/sys/sys/diskmbr.h b/sys/sys/diskmbr.h
index 1e3865c9000a7..e664e26743e76 100644
--- a/sys/sys/diskmbr.h
+++ b/sys/sys/diskmbr.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
- * $Id: disklabel.h,v 1.41 1999/08/11 03:02:05 imp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_DISKLABEL_H_
diff --git a/sys/sys/diskpc98.h b/sys/sys/diskpc98.h
index 1e3865c9000a7..e664e26743e76 100644
--- a/sys/sys/diskpc98.h
+++ b/sys/sys/diskpc98.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
- * $Id: disklabel.h,v 1.41 1999/08/11 03:02:05 imp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_DISKLABEL_H_
diff --git a/sys/sys/diskslice.h b/sys/sys/diskslice.h
index 881cf3048d7a2..418df7cc6c63f 100644
--- a/sys/sys/diskslice.h
+++ b/sys/sys/diskslice.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: diskslice.h,v 1.29 1998/08/23 20:16:35 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_DISKSLICE_H_
diff --git a/sys/sys/dkbad.h b/sys/sys/dkbad.h
index a076e00444fb3..4aad13214f476 100644
--- a/sys/sys/dkbad.h
+++ b/sys/sys/dkbad.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dkbad.h	8.2 (Berkeley) 7/10/94
- * $Id: dkbad.h,v 1.10 1998/02/01 20:08:36 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_DKBAD_H_
diff --git a/sys/sys/dkstat.h b/sys/sys/dkstat.h
index d7abbb19244de..c62d6ce1350f5 100644
--- a/sys/sys/dkstat.h
+++ b/sys/sys/dkstat.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dkstat.h	8.2 (Berkeley) 1/21/94
- * $Id: dkstat.h,v 1.9 1997/09/07 05:27:05 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_DKSTAT_H_
diff --git a/sys/sys/dmap.h b/sys/sys/dmap.h
index d31bbc0eba404..7931760867385 100644
--- a/sys/sys/dmap.h
+++ b/sys/sys/dmap.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dmap.h	8.2 (Berkeley) 1/4/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_DMAP_H_
diff --git a/sys/sys/domain.h b/sys/sys/domain.h
index 0bf516be15d9d..3b7f14c37aac7 100644
--- a/sys/sys/domain.h
+++ b/sys/sys/domain.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)domain.h	8.1 (Berkeley) 6/2/93
- * $Id: domain.h,v 1.11 1999/01/21 00:26:39 julian Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_DOMAIN_H_
diff --git a/sys/sys/elf32.h b/sys/sys/elf32.h
index d88ef2c3252ac..309f1a43eadae 100644
--- a/sys/sys/elf32.h
+++ b/sys/sys/elf32.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: elf32.h,v 1.5 1998/09/14 20:30:13 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_ELF32_H_
diff --git a/sys/sys/elf64.h b/sys/sys/elf64.h
index 464815a27d9b5..022b174f559de 100644
--- a/sys/sys/elf64.h
+++ b/sys/sys/elf64.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: elf64.h,v 1.7 1998/09/14 20:30:13 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_ELF64_H_
diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h
index 7785d202f1520..207050debe026 100644
--- a/sys/sys/elf_common.h
+++ b/sys/sys/elf_common.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: elf_common.h,v 1.3 1998/09/14 20:30:13 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_ELF_COMMON_H_
diff --git a/sys/sys/elf_generic.h b/sys/sys/elf_generic.h
index bc1203b69a46a..32c3e161b5a4c 100644
--- a/sys/sys/elf_generic.h
+++ b/sys/sys/elf_generic.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: elf_generic.h,v 1.2 1998/09/14 20:30:13 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_ELF_GENERIC_H_
diff --git a/sys/sys/errno.h b/sys/sys/errno.h
index 0ccb10528b5a8..c25b6afef90df 100644
--- a/sys/sys/errno.h
+++ b/sys/sys/errno.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)errno.h	8.5 (Berkeley) 1/21/94
- * $Id: errno.h,v 1.11 1998/12/14 18:54:04 dt Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_ERRNO_H_
diff --git a/sys/sys/eventhandler.h b/sys/sys/eventhandler.h
index b0198daf30aa0..4ebdc2112d8c1 100644
--- a/sys/sys/eventhandler.h
+++ b/sys/sys/eventhandler.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: eventhandler.h,v 1.1 1999/08/21 06:24:39 msmith Exp $
+ * $FreeBSD$
  */
 
 #include <sys/queue.h>
diff --git a/sys/sys/exec.h b/sys/sys/exec.h
index ef643ec89ea72..d58fbe89ac4d4 100644
--- a/sys/sys/exec.h
+++ b/sys/sys/exec.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.3 (Berkeley) 1/21/94
- * $Id: exec.h,v 1.23 1999/01/29 08:36:45 dillon Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_EXEC_H_
diff --git a/sys/sys/fbio.h b/sys/sys/fbio.h
index 055dfad49ae15..b2413ead61edb 100644
--- a/sys/sys/fbio.h
+++ b/sys/sys/fbio.h
@@ -36,7 +36,7 @@
  *
  *	@(#)fbio.h	8.2 (Berkeley) 10/30/93
  *
- * $Id: fbio.h,v 1.6 1999/06/22 14:13:43 yokota Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_FBIO_H_
diff --git a/sys/sys/fcntl.h b/sys/sys/fcntl.h
index 7133e17bbf63b..b81f904daaba0 100644
--- a/sys/sys/fcntl.h
+++ b/sys/sys/fcntl.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fcntl.h	8.3 (Berkeley) 1/21/94
- * $Id: fcntl.h,v 1.6 1997/02/22 09:45:13 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_FCNTL_H_
diff --git a/sys/sys/fdcio.h b/sys/sys/fdcio.h
index 891d8f0a22a9f..3b4da37da238a 100644
--- a/sys/sys/fdcio.h
+++ b/sys/sys/fdcio.h
@@ -24,7 +24,7 @@
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_MACHINE_IOCTL_FD_H_
diff --git a/sys/sys/file.h b/sys/sys/file.h
index ec425b4c5418c..072a7652fc44a 100644
--- a/sys/sys/file.h
+++ b/sys/sys/file.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)file.h	8.3 (Berkeley) 1/9/95
- * $Id: file.h,v 1.17 1999/04/04 21:41:25 dt Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_FILE_H_
diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h
index 92b5562ff91df..4505875fe5c4c 100644
--- a/sys/sys/filedesc.h
+++ b/sys/sys/filedesc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)filedesc.h	8.1 (Berkeley) 6/2/93
- * $Id: filedesc.h,v 1.14 1998/11/11 10:04:12 truckman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_FILEDESC_H_
diff --git a/sys/sys/filio.h b/sys/sys/filio.h
index d0c94af7b6441..07dff6266568b 100644
--- a/sys/sys/filio.h
+++ b/sys/sys/filio.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)filio.h	8.1 (Berkeley) 3/28/94
- * $Id: filio.h,v 1.4 1997/02/22 09:45:16 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_FILIO_H_
diff --git a/sys/sys/gmon.h b/sys/sys/gmon.h
index 9107c93f071a1..79434a4888a96 100644
--- a/sys/sys/gmon.h
+++ b/sys/sys/gmon.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)gmon.h	8.2 (Berkeley) 1/4/94
- * $Id: gmon.h,v 1.13 1997/07/13 16:38:31 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_GMON_H_
diff --git a/sys/sys/imgact.h b/sys/sys/imgact.h
index d206f268a18df..ec147ba8698c7 100644
--- a/sys/sys/imgact.h
+++ b/sys/sys/imgact.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: imgact.h,v 1.18 1998/12/30 10:38:59 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_IMGACT_H_
diff --git a/sys/sys/imgact_aout.h b/sys/sys/imgact_aout.h
index f05c0026c55fa..5b4b68fcbdbdb 100644
--- a/sys/sys/imgact_aout.h
+++ b/sys/sys/imgact_aout.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)exec.h	8.1 (Berkeley) 6/11/93
- *	$Id: imgact_aout.h,v 1.8 1997/12/19 20:44:48 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_IMGACT_AOUT_H_
diff --git a/sys/sys/imgact_elf.h b/sys/sys/imgact_elf.h
index 618abec7427af..596ecdbb14d81 100644
--- a/sys/sys/imgact_elf.h
+++ b/sys/sys/imgact_elf.h
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: imgact_elf.h,v 1.13 1999/02/06 16:39:16 mjacob Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_IMGACT_ELF_H_
diff --git a/sys/sys/inflate.h b/sys/sys/inflate.h
index 73d9175e8ffa2..8b1e95de19586 100644
--- a/sys/sys/inflate.h
+++ b/sys/sys/inflate.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: inflate.h,v 1.8 1997/02/22 09:45:20 peter Exp $
+ * $FreeBSD$
  *
  */
 #ifndef	_SYS_INFLATE_H_
diff --git a/sys/sys/interrupt.h b/sys/sys/interrupt.h
index 6c717030b6154..01b45cb9f8791 100644
--- a/sys/sys/interrupt.h
+++ b/sys/sys/interrupt.h
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: interrupt.h,v 1.7 1998/08/11 15:08:13 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_INTERRUPT_H_
diff --git a/sys/sys/inttypes.h b/sys/sys/inttypes.h
index 824786a65aa64..f1d94c615e7fe 100644
--- a/sys/sys/inttypes.h
+++ b/sys/sys/inttypes.h
@@ -1,6 +1,6 @@
 /*
  * This file is in the public domain.
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_INTTYPES_H_
diff --git a/sys/sys/ioccom.h b/sys/sys/ioccom.h
index 26cd972aef1ea..3dc3c1e0164a2 100644
--- a/sys/sys/ioccom.h
+++ b/sys/sys/ioccom.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ioccom.h	8.2 (Berkeley) 3/28/94
- * $Id: ioccom.h,v 1.6 1997/02/22 09:45:21 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_IOCCOM_H_
diff --git a/sys/sys/ioctl.h b/sys/sys/ioctl.h
index 48e0183954710..11a22c60434e4 100644
--- a/sys/sys/ioctl.h
+++ b/sys/sys/ioctl.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ioctl.h	8.6 (Berkeley) 3/28/94
- * $Id: ioctl.h,v 1.6 1997/02/22 09:45:22 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_IOCTL_H_
diff --git a/sys/sys/ioctl_bt848.h b/sys/sys/ioctl_bt848.h
index 0767abddb684c..30e18d156da3a 100644
--- a/sys/sys/ioctl_bt848.h
+++ b/sys/sys/ioctl_bt848.h
@@ -1,7 +1,7 @@
 /*
  * extensions to ioctl_meteor.h for the bt848 cards
  *
- * $Id: ioctl_bt848.h,v 1.22 1999/02/15 11:04:36 roger Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/sys/ioctl_compat.h b/sys/sys/ioctl_compat.h
index ab067b97e42ba..baf42e090f831 100644
--- a/sys/sys/ioctl_compat.h
+++ b/sys/sys/ioctl_compat.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ioctl_compat.h	8.4 (Berkeley) 1/21/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_IOCTL_COMPAT_H_
diff --git a/sys/sys/ipc.h b/sys/sys/ipc.h
index cb7ff9ece4e93..d81c5bc9d118e 100644
--- a/sys/sys/ipc.h
+++ b/sys/sys/ipc.h
@@ -41,7 +41,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ipc.h	8.4 (Berkeley) 2/19/95
- * $Id: ipc.h,v 1.12 1998/02/25 02:17:46 bde Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/sys/jail.h b/sys/sys/jail.h
index ca6fb944edc94..560f4b8586664 100644
--- a/sys/sys/jail.h
+++ b/sys/sys/jail.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: jail.h,v 1.2 1999/05/16 10:51:52 phk Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/sys/kbio.h b/sys/sys/kbio.h
index c8e99471e67a3..2712a125de223 100644
--- a/sys/sys/kbio.h
+++ b/sys/sys/kbio.h
@@ -1,5 +1,5 @@
 /*-
- * $Id: $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_KBIO_H_
diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h
index 5a2b617a448f9..c6d984c1bb052 100644
--- a/sys/sys/kernel.h
+++ b/sys/sys/kernel.h
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernel.h	8.3 (Berkeley) 1/21/94
- * $Id: kernel.h,v 1.57 1999/07/04 00:25:33 mckusick Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_KERNEL_H_
diff --git a/sys/sys/ktrace.h b/sys/sys/ktrace.h
index b0382bd7a1e31..b88b2b62c119c 100644
--- a/sys/sys/ktrace.h
+++ b/sys/sys/ktrace.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ktrace.h	8.1 (Berkeley) 6/2/93
- * $Id: ktrace.h,v 1.13 1999/05/13 09:09:37 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_KTRACE_H_
diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h
index bdc060346a6e4..6f7c4ae90a595 100644
--- a/sys/sys/libkern.h
+++ b/sys/sys/libkern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)libkern.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_LIBKERN_H_
diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h
index 00645fb949b47..4e5a94a5aba8f 100644
--- a/sys/sys/linedisc.h
+++ b/sys/sys/linedisc.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.h	8.5 (Berkeley) 1/9/95
- * $Id: conf.h,v 1.78 1999/08/25 22:50:12 julian Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_CONF_H_
diff --git a/sys/sys/linker.h b/sys/sys/linker.h
index 0c0cfa1d354c7..407aba14f8d1f 100644
--- a/sys/sys/linker.h
+++ b/sys/sys/linker.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: linker.h,v 1.14 1999/01/27 23:45:44 dillon Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_LINKER_H_
diff --git a/sys/sys/linker_set.h b/sys/sys/linker_set.h
index 837da207f7a55..a4736a56707d0 100644
--- a/sys/sys/linker_set.h
+++ b/sys/sys/linker_set.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: linker_set.h,v 1.2 1999/05/08 12:52:26 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_LINKER_SET_H_
diff --git a/sys/sys/lock.h b/sys/sys/lock.h
index 67a56d97b97b8..04157c0fc3dc1 100644
--- a/sys/sys/lock.h
+++ b/sys/sys/lock.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lock.h	8.12 (Berkeley) 5/19/95
- * $Id: lock.h,v 1.14 1999/06/26 02:45:40 mckusick Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_LOCK_H_
diff --git a/sys/sys/lockf.h b/sys/sys/lockf.h
index 2bd1898bdaf5e..17980f6a1bbd8 100644
--- a/sys/sys/lockf.h
+++ b/sys/sys/lockf.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lockf.h	8.1 (Berkeley) 6/11/93
- * $Id: lockf.h,v 1.8 1997/09/07 05:27:16 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_LOCKF_H_
diff --git a/sys/sys/lockmgr.h b/sys/sys/lockmgr.h
index 67a56d97b97b8..04157c0fc3dc1 100644
--- a/sys/sys/lockmgr.h
+++ b/sys/sys/lockmgr.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lock.h	8.12 (Berkeley) 5/19/95
- * $Id: lock.h,v 1.14 1999/06/26 02:45:40 mckusick Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_LOCK_H_
diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
index c1fc86d7516cd..bf85c33db3dc5 100644
--- a/sys/sys/malloc.h
+++ b/sys/sys/malloc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)malloc.h	8.5 (Berkeley) 5/3/95
- * $Id: malloc.h,v 1.41 1999/01/27 21:50:00 dillon Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_MALLOC_H_
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index 959b70b073e1f..475b997ab6cb7 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mbuf.h	8.5 (Berkeley) 2/19/95
- * $Id: mbuf.h,v 1.30 1998/11/05 14:28:25 dg Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_MBUF_H_
diff --git a/sys/sys/md5.h b/sys/sys/md5.h
index 1b636b590151d..a69f790995603 100644
--- a/sys/sys/md5.h
+++ b/sys/sys/md5.h
@@ -1,5 +1,5 @@
 /* MD5.H - header file for MD5C.C
- * $Id: md5.h,v 1.10 1998/03/27 10:22:35 phk Exp $
+ * $FreeBSD$
  */
 
 /* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
diff --git a/sys/sys/mman.h b/sys/sys/mman.h
index 7329d8f7ae464..d5257ea69536c 100644
--- a/sys/sys/mman.h
+++ b/sys/sys/mman.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mman.h	8.2 (Berkeley) 1/9/95
- * $Id: mman.h,v 1.24 1999/01/06 23:05:40 julian Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_MMAN_H_
diff --git a/sys/sys/module.h b/sys/sys/module.h
index 45f3a405990d3..83cea0d51463f 100644
--- a/sys/sys/module.h
+++ b/sys/sys/module.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: module.h,v 1.10 1999/01/29 08:36:45 dillon Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_MODULE_H_
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index a988d3f589459..625d12d9f5669 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mount.h	8.21 (Berkeley) 5/20/95
- *	$Id: mount.h,v 1.74 1999/02/16 10:49:55 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_MOUNT_H_
diff --git a/sys/sys/mouse.h b/sys/sys/mouse.h
index 98cc0ad38a056..12d49a2a5d759 100644
--- a/sys/sys/mouse.h
+++ b/sys/sys/mouse.h
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mouse.h,v 1.13 1999/07/12 15:16:12 yokota Exp $
+ * $FreeBSD$
  */
 
 #ifndef _MACHINE_MOUSE_H_
diff --git a/sys/sys/msg.h b/sys/sys/msg.h
index 7b998c2ff4f90..3dd70f1bc89d8 100644
--- a/sys/sys/msg.h
+++ b/sys/sys/msg.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 /*	$NetBSD: msg.h,v 1.4 1994/06/29 06:44:43 cgd Exp $	*/
 
 /*
diff --git a/sys/sys/msgbuf.h b/sys/sys/msgbuf.h
index 4cfd004e49f86..aa7df03e79152 100644
--- a/sys/sys/msgbuf.h
+++ b/sys/sys/msgbuf.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)msgbuf.h	8.1 (Berkeley) 6/2/93
- * $Id: msgbuf.h,v 1.10 1998/05/19 08:58:35 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_MSGBUF_H_
diff --git a/sys/sys/mtio.h b/sys/sys/mtio.h
index 1a91daf0c7fa8..30b8b993819ea 100644
--- a/sys/sys/mtio.h
+++ b/sys/sys/mtio.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mtio.h	8.1 (Berkeley) 6/2/93
- * $Id: mtio.h,v 1.17 1999/02/05 07:57:26 mjacob Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_MTIO_H_
diff --git a/sys/sys/namei.h b/sys/sys/namei.h
index 5c41f34269abf..c4611d9c3fc46 100644
--- a/sys/sys/namei.h
+++ b/sys/sys/namei.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)namei.h	8.5 (Berkeley) 1/9/95
- * $Id: namei.h,v 1.20 1998/03/28 10:33:22 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_NAMEI_H_
diff --git a/sys/sys/param.h b/sys/sys/param.h
index ef89e207e8f42..b61279471c541 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.3 (Berkeley) 4/4/95
- * $Id: param.h,v 1.50 1999/06/20 08:34:24 jb Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_PARAM_H_
diff --git a/sys/sys/pioctl.h b/sys/sys/pioctl.h
index 8c936a030799d..b43a47ff5bff7 100644
--- a/sys/sys/pioctl.h
+++ b/sys/sys/pioctl.h
@@ -33,7 +33,7 @@
 /*
  * procfs ioctl definitions.
  *
- * $Id: pioctl.h,v 1.6 1997/12/20 03:05:35 sef Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_PIOCTL_H
diff --git a/sys/sys/pipe.h b/sys/sys/pipe.h
index 9b06500d75c21..e95f45534537e 100644
--- a/sys/sys/pipe.h
+++ b/sys/sys/pipe.h
@@ -18,7 +18,7 @@
  * 5. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id: pipe.h,v 1.11 1998/11/11 10:04:12 truckman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_PIPE_H_
diff --git a/sys/sys/poll.h b/sys/sys/poll.h
index 9e8986aae763f..7620a39bd5124 100644
--- a/sys/sys/poll.h
+++ b/sys/sys/poll.h
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: poll.h,v 1.3 1997/12/15 03:09:48 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_POLL_H_
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index f735c2181307c..7885af31d6d7f 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)proc.h	8.15 (Berkeley) 5/19/95
- * $Id: proc.h,v 1.85 1999/07/04 00:25:34 mckusick Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_PROC_H_
diff --git a/sys/sys/procfs.h b/sys/sys/procfs.h
index d0656861cc68c..04f0e1c71a806 100644
--- a/sys/sys/procfs.h
+++ b/sys/sys/procfs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_PROCFS_H_
diff --git a/sys/sys/protosw.h b/sys/sys/protosw.h
index 99a1d92dd7319..15f6e13aef557 100644
--- a/sys/sys/protosw.h
+++ b/sys/sys/protosw.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)protosw.h	8.1 (Berkeley) 6/2/93
- *	$Id: protosw.h,v 1.25 1998/08/23 03:07:17 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_PROTOSW_H_
diff --git a/sys/sys/ptio.h b/sys/sys/ptio.h
index dd4f1492c889c..1292280528d3d 100644
--- a/sys/sys/ptio.h
+++ b/sys/sys/ptio.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ptio.h,v 1.1 1999/08/20 03:48:11 ken Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_PTIO_H_
diff --git a/sys/sys/ptrace.h b/sys/sys/ptrace.h
index 288a0fa2766c2..f7f77edeec816 100644
--- a/sys/sys/ptrace.h
+++ b/sys/sys/ptrace.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.2 (Berkeley) 1/4/94
- * $Id: ptrace.h,v 1.7 1997/02/22 09:45:43 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_PTRACE_H_
diff --git a/sys/sys/queue.h b/sys/sys/queue.h
index fd4df60a60dd3..4bf34b8d720eb 100644
--- a/sys/sys/queue.h
+++ b/sys/sys/queue.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)queue.h	8.5 (Berkeley) 8/20/94
- * $Id: queue.h,v 1.25 1999/04/20 22:37:17 n_hibma Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_QUEUE_H_
diff --git a/sys/sys/random.h b/sys/sys/random.h
index 569173a1a6a25..e084f8111d1e4 100644
--- a/sys/sys/random.h
+++ b/sys/sys/random.h
@@ -1,7 +1,7 @@
 /*
  * random.h -- A strong random number generator
  *
- * $Id: random.h,v 1.15 1998/06/18 15:32:05 bde Exp $
+ * $FreeBSD$
  *
  * Version 0.95, last modified 18-Oct-95
  * 
diff --git a/sys/sys/reboot.h b/sys/sys/reboot.h
index d9678bcf09a18..d0c4210515eb8 100644
--- a/sys/sys/reboot.h
+++ b/sys/sys/reboot.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)reboot.h	8.3 (Berkeley) 12/13/94
- * $Id: reboot.h,v 1.16 1997/02/22 09:45:45 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_REBOOT_H_
diff --git a/sys/sys/resource.h b/sys/sys/resource.h
index 7e09e86dadcec..3dc21820fb5e2 100644
--- a/sys/sys/resource.h
+++ b/sys/sys/resource.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)resource.h	8.4 (Berkeley) 1/9/95
- * $Id: resource.h,v 1.8 1997/11/18 08:07:37 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_RESOURCE_H_
diff --git a/sys/sys/resourcevar.h b/sys/sys/resourcevar.h
index 9e476eccce2e4..eca8e47d968e5 100644
--- a/sys/sys/resourcevar.h
+++ b/sys/sys/resourcevar.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)resourcevar.h	8.4 (Berkeley) 1/9/95
- * $Id: resourcevar.h,v 1.12 1998/05/28 09:30:27 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_RESOURCEVAR_H_
diff --git a/sys/sys/rman.h b/sys/sys/rman.h
index 278e33cba9d27..6283f315ce1e8 100644
--- a/sys/sys/rman.h
+++ b/sys/sys/rman.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: rman.h,v 1.1 1998/10/29 01:48:30 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_RMAN_H_
diff --git a/sys/sys/rtprio.h b/sys/sys/rtprio.h
index 6f196ab1c0bea..5d115f5693db8 100644
--- a/sys/sys/rtprio.h
+++ b/sys/sys/rtprio.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: rtprio.h,v 1.6 1998/03/08 17:25:35 dufault Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_RTPRIO_H_
diff --git a/sys/sys/scsiio.h b/sys/sys/scsiio.h
index b7cbfd4136c39..b49c8d6707dad 100644
--- a/sys/sys/scsiio.h
+++ b/sys/sys/scsiio.h
@@ -1,5 +1,5 @@
 /*
- * $Id: scsiio.h,v 1.9 1998/02/01 04:13:13 wollman Exp $
+ * $FreeBSD$
  */
 #ifndef	_SYS_SCSIIO_H_
 #define	_SYS_SCSIIO_H_
diff --git a/sys/sys/select.h b/sys/sys/select.h
index e69971e3b6845..89e7f9adcbbc3 100644
--- a/sys/sys/select.h
+++ b/sys/sys/select.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)select.h	8.2 (Berkeley) 1/4/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_SELECT_H_
diff --git a/sys/sys/selinfo.h b/sys/sys/selinfo.h
index e69971e3b6845..89e7f9adcbbc3 100644
--- a/sys/sys/selinfo.h
+++ b/sys/sys/selinfo.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)select.h	8.2 (Berkeley) 1/4/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_SELECT_H_
diff --git a/sys/sys/sem.h b/sys/sys/sem.h
index b51fc24675277..798f5bb7d124f 100644
--- a/sys/sys/sem.h
+++ b/sys/sys/sem.h
@@ -1,4 +1,4 @@
-/* $Id: sem.h,v 1.17 1998/12/14 21:01:47 dillon Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: sem.h,v 1.5 1994/06/29 06:45:15 cgd Exp $	*/
 
 /*
diff --git a/sys/sys/shm.h b/sys/sys/shm.h
index 0e8bf40783b47..a792f561b1161 100644
--- a/sys/sys/shm.h
+++ b/sys/sys/shm.h
@@ -1,4 +1,4 @@
-/* $Id: shm.h,v 1.11 1997/02/22 09:45:52 peter Exp $ */
+/* $FreeBSD$ */
 /*	$NetBSD: shm.h,v 1.15 1994/06/29 06:45:17 cgd Exp $	*/
 
 /*
diff --git a/sys/sys/signal.h b/sys/sys/signal.h
index 471baa97b7542..4a0fee85f7f16 100644
--- a/sys/sys/signal.h
+++ b/sys/sys/signal.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signal.h	8.4 (Berkeley) 5/4/95
- * $Id: signal.h,v 1.14 1998/08/05 09:04:36 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_SIGNAL_H_
diff --git a/sys/sys/signalvar.h b/sys/sys/signalvar.h
index e2bdb4a97c611..058f0f1562dcd 100644
--- a/sys/sys/signalvar.h
+++ b/sys/sys/signalvar.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)signalvar.h	8.6 (Berkeley) 2/19/95
- * $Id: signalvar.h,v 1.24 1999/07/06 07:13:48 cracauer Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_SIGNALVAR_H_		/* tmp for user.h */
diff --git a/sys/sys/sliceio.h b/sys/sys/sliceio.h
index 2a519affb5077..e93eb3bbcaae2 100644
--- a/sys/sys/sliceio.h
+++ b/sys/sys/sliceio.h
@@ -1,5 +1,5 @@
 /*
- * $Id: sliceio.h,v 1.1 1998/04/19 23:32:43 julian Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_SLICEIO_H_
diff --git a/sys/sys/smp.h b/sys/sys/smp.h
index c425db6f7d32b..0524d76b6fbe7 100644
--- a/sys/sys/smp.h
+++ b/sys/sys/smp.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: smp.h,v 1.45 1999/04/28 01:04:07 luoqi Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/sys/socket.h b/sys/sys/socket.h
index b7da75a1c5152..a7b88d464b206 100644
--- a/sys/sys/socket.h
+++ b/sys/sys/socket.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)socket.h	8.4 (Berkeley) 2/21/94
- * $Id: socket.h,v 1.26 1998/09/15 11:44:44 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_SOCKET_H_
diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h
index 8fb052c297c53..fb1542582c8b0 100644
--- a/sys/sys/socketvar.h
+++ b/sys/sys/socketvar.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)socketvar.h	8.3 (Berkeley) 2/19/95
- *	$Id: socketvar.h,v 1.37 1999/04/04 21:41:28 dt Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_SOCKETVAR_H_
diff --git a/sys/sys/sockio.h b/sys/sys/sockio.h
index 36f0c2e213beb..afefc83d7f209 100644
--- a/sys/sys/sockio.h
+++ b/sys/sys/sockio.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sockio.h	8.1 (Berkeley) 3/28/94
- * $Id: sockio.h,v 1.11 1997/10/07 07:39:40 joerg Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_SOCKIO_H_
diff --git a/sys/sys/stat.h b/sys/sys/stat.h
index 52a1a416601bb..f6dc2319ca3f8 100644
--- a/sys/sys/stat.h
+++ b/sys/sys/stat.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stat.h	8.12 (Berkeley) 6/16/95
- * $Id: stat.h,v 1.16 1999/05/11 19:54:58 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_STAT_H_
diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h
index c40111565347f..b776b22531c6a 100644
--- a/sys/sys/sysctl.h
+++ b/sys/sys/sysctl.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sysctl.h	8.1 (Berkeley) 6/2/93
- * $Id: sysctl.h,v 1.73 1999/04/28 11:38:10 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_SYSCTL_H_
diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h
index 9bfc9788eca0b..ab258c2e5ea3b 100644
--- a/sys/sys/sysent.h
+++ b/sys/sys/sysent.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sysent.h,v 1.19 1998/09/14 05:36:51 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_SYSENT_H_
diff --git a/sys/sys/syslimits.h b/sys/sys/syslimits.h
index 3546e6b1d3746..634db8f3b3c24 100644
--- a/sys/sys/syslimits.h
+++ b/sys/sys/syslimits.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)syslimits.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_SYSLIMITS_H_
diff --git a/sys/sys/syslog.h b/sys/sys/syslog.h
index 0a9df010ce3f7..8359101a59e8b 100644
--- a/sys/sys/syslog.h
+++ b/sys/sys/syslog.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)syslog.h	8.1 (Berkeley) 6/2/93
- * $Id: syslog.h,v 1.16 1998/07/13 06:45:17 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_SYSLOG_H_
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index e2fdc9ff4ddb4..9ed5a11fff6ec 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)systm.h	8.7 (Berkeley) 3/29/95
- * $Id: systm.h,v 1.95 1999/07/24 09:34:11 dfr Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_SYSTM_H_
diff --git a/sys/sys/tablet.h b/sys/sys/tablet.h
index e934d3c3dcab4..5caa181af9f18 100644
--- a/sys/sys/tablet.h
+++ b/sys/sys/tablet.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tablet.h	8.4 (Berkeley) 7/10/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_TABLET_H_
diff --git a/sys/sys/termios.h b/sys/sys/termios.h
index 09025b4ab34ca..72f4b9e060cf0 100644
--- a/sys/sys/termios.h
+++ b/sys/sys/termios.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)termios.h	8.3 (Berkeley) 3/28/94
- * $Id: termios.h,v 1.10 1998/03/12 14:09:53 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_TERMIOS_H_
diff --git a/sys/sys/time.h b/sys/sys/time.h
index 32ea4a0d8f988..1742eb4c837b1 100644
--- a/sys/sys/time.h
+++ b/sys/sys/time.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)time.h	8.5 (Berkeley) 5/4/95
- * $Id: time.h,v 1.38 1999/04/25 08:59:55 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_TIME_H_
diff --git a/sys/sys/timeb.h b/sys/sys/timeb.h
index be00cda04262a..40aba11ae6b49 100644
--- a/sys/sys/timeb.h
+++ b/sys/sys/timeb.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)timeb.h	8.2 (Berkeley) 1/21/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_TIMEB_H_
diff --git a/sys/sys/timepps.h b/sys/sys/timepps.h
index b278aa14b8b38..58e562f3612de 100644
--- a/sys/sys/timepps.h
+++ b/sys/sys/timepps.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: timepps.h,v 1.7 1999/03/30 11:44:59 phk Exp $
+ * $FreeBSD$
  *
  * The is a FreeBSD protype version of the "draft-mogul-pps-api-02.txt" 
  * specification for Pulse Per Second timing interfaces.  
diff --git a/sys/sys/timers.h b/sys/sys/timers.h
index 6482d3c92018c..043d37670b080 100644
--- a/sys/sys/timers.h
+++ b/sys/sys/timers.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  *
  * Description : Basic timers header.
  */
diff --git a/sys/sys/times.h b/sys/sys/times.h
index 961ebfd182644..ba6dee0ed7093 100644
--- a/sys/sys/times.h
+++ b/sys/sys/times.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)times.h	8.4 (Berkeley) 1/21/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_TIMES_H_
diff --git a/sys/sys/timetc.h b/sys/sys/timetc.h
index 32ea4a0d8f988..1742eb4c837b1 100644
--- a/sys/sys/timetc.h
+++ b/sys/sys/timetc.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)time.h	8.5 (Berkeley) 5/4/95
- * $Id: time.h,v 1.38 1999/04/25 08:59:55 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_TIME_H_
diff --git a/sys/sys/tprintf.h b/sys/sys/tprintf.h
index 239bb52a78e76..ef5660907adb2 100644
--- a/sys/sys/tprintf.h
+++ b/sys/sys/tprintf.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tprintf.h	8.1 (Berkeley) 6/2/93
- * $Id: tprintf.h,v 1.7 1998/07/13 06:45:18 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_TPRINTF_H_
diff --git a/sys/sys/tty.h b/sys/sys/tty.h
index 63a49e90417ca..00fb7a8ad5ca1 100644
--- a/sys/sys/tty.h
+++ b/sys/sys/tty.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty.h	8.6 (Berkeley) 1/21/94
- * $Id: tty.h,v 1.46 1999/08/08 20:24:48 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_TTY_H_
diff --git a/sys/sys/ttychars.h b/sys/sys/ttychars.h
index 3b96b40ab7dbc..d9b59b7f01e94 100644
--- a/sys/sys/ttychars.h
+++ b/sys/sys/ttychars.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttychars.h	8.2 (Berkeley) 1/4/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_TTYCHARS_H_
diff --git a/sys/sys/ttycom.h b/sys/sys/ttycom.h
index a181b77daa5e0..ac6c45a415925 100644
--- a/sys/sys/ttycom.h
+++ b/sys/sys/ttycom.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttycom.h	8.1 (Berkeley) 3/28/94
- * $Id: ttycom.h,v 1.12 1997/02/22 09:46:14 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_TTYCOM_H_
diff --git a/sys/sys/ttydefaults.h b/sys/sys/ttydefaults.h
index f6f8f48a98123..6d23e3bdd074a 100644
--- a/sys/sys/ttydefaults.h
+++ b/sys/sys/ttydefaults.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttydefaults.h	8.4 (Berkeley) 1/21/94
- * $Id: ttydefaults.h,v 1.11 1997/02/22 09:46:16 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/sys/ttydev.h b/sys/sys/ttydev.h
index 79e54f4611c27..739ec477c6193 100644
--- a/sys/sys/ttydev.h
+++ b/sys/sys/ttydev.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ttydev.h	8.2 (Berkeley) 1/4/94
- * $Id$
+ * $FreeBSD$
  */
 
 /* COMPATIBILITY HEADER FILE */
diff --git a/sys/sys/types.h b/sys/sys/types.h
index cd42c19516ca1..bc9c0d44b2d16 100644
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)types.h	8.6 (Berkeley) 2/19/95
- * $Id: types.h,v 1.34 1999/07/18 02:26:02 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_TYPES_H_
diff --git a/sys/sys/ucred.h b/sys/sys/ucred.h
index f65dbe05f0c96..6009f93a675d8 100644
--- a/sys/sys/ucred.h
+++ b/sys/sys/ucred.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ucred.h	8.4 (Berkeley) 1/9/95
- * $Id: ucred.h,v 1.11 1999/04/27 11:18:38 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_UCRED_H_
diff --git a/sys/sys/uio.h b/sys/sys/uio.h
index 5373f886fbec8..e55b840555638 100644
--- a/sys/sys/uio.h
+++ b/sys/sys/uio.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uio.h	8.5 (Berkeley) 2/22/94
- * $Id: uio.h,v 1.8 1997/12/19 10:03:31 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_UIO_H_
diff --git a/sys/sys/un.h b/sys/sys/un.h
index 36dd7257b3106..a99ba68d9a144 100644
--- a/sys/sys/un.h
+++ b/sys/sys/un.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)un.h	8.3 (Berkeley) 2/19/95
- * $Id: un.h,v 1.14 1998/05/15 20:11:40 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_UN_H_
diff --git a/sys/sys/unistd.h b/sys/sys/unistd.h
index d6216039f6b92..7503cddf25741 100644
--- a/sys/sys/unistd.h
+++ b/sys/sys/unistd.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)unistd.h	8.2 (Berkeley) 1/7/94
- * $Id: unistd.h,v 1.18 1998/12/19 02:55:34 julian Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_UNISTD_H_
diff --git a/sys/sys/unpcb.h b/sys/sys/unpcb.h
index 7c3881267ef80..c0b8a373a197f 100644
--- a/sys/sys/unpcb.h
+++ b/sys/sys/unpcb.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)unpcb.h	8.1 (Berkeley) 6/2/93
- * $Id: unpcb.h,v 1.7 1998/05/15 20:11:40 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_UNPCB_H_
diff --git a/sys/sys/user.h b/sys/sys/user.h
index 37fe257a420e2..62ea5c53069a0 100644
--- a/sys/sys/user.h
+++ b/sys/sys/user.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)user.h	8.2 (Berkeley) 9/23/93
- * $Id: user.h,v 1.20 1999/01/26 02:38:11 julian Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_USER_H_
diff --git a/sys/sys/utsname.h b/sys/sys/utsname.h
index 0387cc1d206ec..375c3d403f36c 100644
--- a/sys/sys/utsname.h
+++ b/sys/sys/utsname.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)utsname.h	8.1 (Berkeley) 1/4/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_UTSNAME_H
diff --git a/sys/sys/vadvise.h b/sys/sys/vadvise.h
index 28b29582efdc6..cf179f04c07f4 100644
--- a/sys/sys/vadvise.h
+++ b/sys/sys/vadvise.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vadvise.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_VADVISE_H_
diff --git a/sys/sys/vcmd.h b/sys/sys/vcmd.h
index 36d3cf83b294a..837255cf6dd4e 100644
--- a/sys/sys/vcmd.h
+++ b/sys/sys/vcmd.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vcmd.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef	_SYS_VCMD_H_
diff --git a/sys/sys/vlimit.h b/sys/sys/vlimit.h
index 6a63166b345d4..a5a86d7f65b89 100644
--- a/sys/sys/vlimit.h
+++ b/sys/sys/vlimit.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vlimit.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_VLIMIT_H_
diff --git a/sys/sys/vmmeter.h b/sys/sys/vmmeter.h
index b476d00bac8b5..e382d900f6dfa 100644
--- a/sys/sys/vmmeter.h
+++ b/sys/sys/vmmeter.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vmmeter.h	8.2 (Berkeley) 7/10/94
- * $Id: vmmeter.h,v 1.17 1999/02/08 02:42:13 dillon Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_VMMETER_H_
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index b9c43e37fc492..e78db43178817 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vnode.h	8.7 (Berkeley) 2/4/94
- * $Id: vnode.h,v 1.97 1999/08/25 12:24:30 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_VNODE_H_
diff --git a/sys/sys/vsio.h b/sys/sys/vsio.h
index 93a1c70bcd280..702e71dce2b34 100644
--- a/sys/sys/vsio.h
+++ b/sys/sys/vsio.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vsio.h	8.1 (Berkeley) 6/2/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _SYS_VSIO_H_
diff --git a/sys/sys/wait.h b/sys/sys/wait.h
index b0716d27fa7a1..c854e149d3c68 100644
--- a/sys/sys/wait.h
+++ b/sys/sys/wait.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)wait.h	8.2 (Berkeley) 7/10/94
- * $Id: wait.h,v 1.8 1997/02/22 09:46:31 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_WAIT_H_
diff --git a/sys/sys/xrpuio.h b/sys/sys/xrpuio.h
index a5eca5631e112..70de800d9a4a3 100644
--- a/sys/sys/xrpuio.h
+++ b/sys/sys/xrpuio.h
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id$
+ * $FreeBSD$
  *
  */
 
diff --git a/sys/tools/devlist2h.awk b/sys/tools/devlist2h.awk
index c6872bc5a8e7a..1863a227ab7f7 100644
--- a/sys/tools/devlist2h.awk
+++ b/sys/tools/devlist2h.awk
@@ -64,7 +64,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#	$Id$
+# $FreeBSD$
 #
 function collectline(f, line) {
 	oparen = 0
diff --git a/sys/tools/miidevs2h.awk b/sys/tools/miidevs2h.awk
index c6872bc5a8e7a..1863a227ab7f7 100644
--- a/sys/tools/miidevs2h.awk
+++ b/sys/tools/miidevs2h.awk
@@ -64,7 +64,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-#	$Id$
+# $FreeBSD$
 #
 function collectline(f, line) {
 	oparen = 0
diff --git a/sys/tools/vnode_if.awk b/sys/tools/vnode_if.awk
index 07e0e91781c5c..9c042dbac7d8b 100644
--- a/sys/tools/vnode_if.awk
+++ b/sys/tools/vnode_if.awk
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)vnode_if.sh	8.1 (Berkeley) 6/10/93
-# $Id: vnode_if.sh,v 1.17 1999/02/28 11:30:00 bde Exp $
+# $FreeBSD$
 #
 
 # Script to produce VFS front-end sugar.
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index 8e205129bea51..74443805a332f 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_alloc.c	8.18 (Berkeley) 5/26/95
- * $Id: ffs_alloc.c,v 1.59 1999/08/23 20:35:19 bde Exp $
+ * $FreeBSD$
  */
 
 #include "opt_quota.h"
diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c
index 5b3df8b658829..ebd630f45c77a 100644
--- a/sys/ufs/ffs/ffs_balloc.c
+++ b/sys/ufs/ffs/ffs_balloc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_balloc.c	8.8 (Berkeley) 6/16/95
- * $Id: ffs_balloc.c,v 1.22 1999/01/28 00:57:54 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h
index 169bf30bdd4cc..177a820fd2145 100644
--- a/sys/ufs/ffs/ffs_extern.h
+++ b/sys/ufs/ffs/ffs_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_extern.h	8.6 (Berkeley) 3/30/95
- * $Id: ffs_extern.h,v 1.25 1999/01/07 16:14:16 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_FFS_EXTERN_H
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index 0895173b6659f..aad428527aeac 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_inode.c	8.13 (Berkeley) 4/21/95
- * $Id: ffs_inode.c,v 1.54 1999/05/02 23:56:48 alc Exp $
+ * $FreeBSD$
  */
 
 #include "opt_quota.h"
diff --git a/sys/ufs/ffs/ffs_softdep_stub.c b/sys/ufs/ffs/ffs_softdep_stub.c
index a396960312d62..652e20ba3cde0 100644
--- a/sys/ufs/ffs/ffs_softdep_stub.c
+++ b/sys/ufs/ffs/ffs_softdep_stub.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)ffs_softdep_stub.c	9.1 (McKusick) 7/10/97
- *	$Id$
+ * $FreeBSD$
  */
 
 /* 
diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index 5052b89f8a8c6..f005c71171adf 100644
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_subr.c	8.5 (Berkeley) 3/21/95
- * $Id: ffs_subr.c,v 1.22 1998/11/29 03:12:06 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/ffs_tables.c b/sys/ufs/ffs/ffs_tables.c
index a3dfe4f0d22e1..0256ee2244bd4 100644
--- a/sys/ufs/ffs/ffs_tables.c
+++ b/sys/ufs/ffs/ffs_tables.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_tables.c	8.1 (Berkeley) 6/11/93
- * $Id$
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 37c82cc883aab..3efbdebb8f395 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vfsops.c	8.31 (Berkeley) 5/20/95
- * $Id: ffs_vfsops.c,v 1.102 1999/08/13 10:29:33 phk Exp $
+ * $FreeBSD$
  */
 
 #include "opt_quota.h"
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index dbf2a913b4bdf..59b8dcdbdeebf 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vnops.c	8.15 (Berkeley) 5/14/95
- * $Id: ffs_vnops.c,v 1.58 1999/06/26 02:46:39 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ffs/fs.h b/sys/ufs/ffs/fs.h
index 9f997318f9974..91979d87cefc0 100644
--- a/sys/ufs/ffs/fs.h
+++ b/sys/ufs/ffs/fs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fs.h	8.13 (Berkeley) 3/21/95
- * $Id: fs.h,v 1.12 1997/03/24 03:19:37 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_FFS_FS_H_
diff --git a/sys/ufs/mfs/mfs_extern.h b/sys/ufs/mfs/mfs_extern.h
index f6dc287736cf6..e146382e3bec6 100644
--- a/sys/ufs/mfs/mfs_extern.h
+++ b/sys/ufs/mfs/mfs_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfs_extern.h	8.4 (Berkeley) 3/30/95
- * $Id: mfs_extern.h,v 1.13 1999/05/10 17:12:43 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_MFS_MFS_EXTERN_H_
diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c
index 87b129a32ddb6..044bf634390d6 100644
--- a/sys/ufs/mfs/mfs_vfsops.c
+++ b/sys/ufs/mfs/mfs_vfsops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfs_vfsops.c	8.11 (Berkeley) 6/19/95
- * $Id: mfs_vfsops.c,v 1.67 1999/08/24 18:35:33 phk Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c
index c2a5fbd03fa0f..ad691df4e91cb 100644
--- a/sys/ufs/mfs/mfs_vnops.c
+++ b/sys/ufs/mfs/mfs_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfs_vnops.c	8.11 (Berkeley) 5/22/95
- * $Id: mfs_vnops.c,v 1.45 1999/06/26 02:46:41 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/mfs/mfsnode.h b/sys/ufs/mfs/mfsnode.h
index f56d4da7101de..da428144b9a6c 100644
--- a/sys/ufs/mfs/mfsnode.h
+++ b/sys/ufs/mfs/mfsnode.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfsnode.h	8.3 (Berkeley) 5/19/95
- * $Id: mfsnode.h,v 1.10 1997/10/16 10:50:05 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_MFS_MFSNODE_H_
diff --git a/sys/ufs/ufs/dinode.h b/sys/ufs/ufs/dinode.h
index 0b8b609474795..461a6c0bdf204 100644
--- a/sys/ufs/ufs/dinode.h
+++ b/sys/ufs/ufs/dinode.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dinode.h	8.3 (Berkeley) 1/21/94
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _UFS_UFS_DINODE_H_
diff --git a/sys/ufs/ufs/dir.h b/sys/ufs/ufs/dir.h
index 6a7a853035b8c..a8948b9aaeff3 100644
--- a/sys/ufs/ufs/dir.h
+++ b/sys/ufs/ufs/dir.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dir.h	8.2 (Berkeley) 1/21/94
- * $Id: dir.h,v 1.7 1997/02/22 09:47:38 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_UFS_DIR_H_
diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h
index 77fe7b3983b75..78fbc0adaff59 100644
--- a/sys/ufs/ufs/inode.h
+++ b/sys/ufs/ufs/inode.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.9 (Berkeley) 5/14/95
- * $Id: inode.h,v 1.25 1999/03/06 05:21:09 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_UFS_INODE_H_
diff --git a/sys/ufs/ufs/quota.h b/sys/ufs/ufs/quota.h
index e5ce29b8bf1e4..f449a1a5d8811 100644
--- a/sys/ufs/ufs/quota.h
+++ b/sys/ufs/ufs/quota.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)quota.h	8.3 (Berkeley) 8/19/94
- * $Id: quota.h,v 1.12 1999/03/05 09:28:33 bde Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_UFS_QUOTA_H_
diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c
index 9a477c51fb42e..cf564071491de 100644
--- a/sys/ufs/ufs/ufs_bmap.c
+++ b/sys/ufs/ufs/ufs_bmap.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_bmap.c	8.7 (Berkeley) 3/21/95
- * $Id: ufs_bmap.c,v 1.29 1999/08/08 18:43:03 phk Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_disksubr.c b/sys/ufs/ufs/ufs_disksubr.c
index a46e11ab7b0c0..a52efbd9ef573 100644
--- a/sys/ufs/ufs/ufs_disksubr.c
+++ b/sys/ufs/ufs/ufs_disksubr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_disksubr.c	8.5 (Berkeley) 1/21/94
- * $Id: ufs_disksubr.c,v 1.40 1999/06/26 02:46:44 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h
index 7798b975c9d66..ee2779d787781 100644
--- a/sys/ufs/ufs/ufs_extern.h
+++ b/sys/ufs/ufs/ufs_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_extern.h	8.10 (Berkeley) 5/14/95
- * $Id: ufs_extern.h,v 1.23 1998/03/08 09:59:24 julian Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_UFS_EXTERN_H_
diff --git a/sys/ufs/ufs/ufs_ihash.c b/sys/ufs/ufs/ufs_ihash.c
index c2dd63e5b7f23..0a7c7d5831911 100644
--- a/sys/ufs/ufs/ufs_ihash.c
+++ b/sys/ufs/ufs/ufs_ihash.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_ihash.c	8.7 (Berkeley) 5/17/95
- * $Id: ufs_ihash.c,v 1.18 1999/01/02 11:34:56 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_inode.c b/sys/ufs/ufs/ufs_inode.c
index 1f4e0b1af8d78..edb8c153f190e 100644
--- a/sys/ufs/ufs/ufs_inode.c
+++ b/sys/ufs/ufs/ufs_inode.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_inode.c	8.9 (Berkeley) 5/14/95
- * $Id: ufs_inode.c,v 1.23 1998/07/03 22:17:02 bde Exp $
+ * $FreeBSD$
  */
 
 #include "opt_quota.h"
diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c
index 29e522768a964..020750d5ddc23 100644
--- a/sys/ufs/ufs/ufs_lookup.c
+++ b/sys/ufs/ufs/ufs_lookup.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_lookup.c	8.15 (Berkeley) 6/16/95
- * $Id: ufs_lookup.c,v 1.28 1999/06/16 23:27:51 mckusick Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c
index 99c35c7b57118..e1b5b5d986f17 100644
--- a/sys/ufs/ufs/ufs_quota.c
+++ b/sys/ufs/ufs/ufs_quota.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_quota.c	8.5 (Berkeley) 5/20/95
- * $Id: ufs_quota.c,v 1.24 1998/07/15 02:32:34 bde Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/ufs/ufs/ufs_readwrite.c b/sys/ufs/ufs/ufs_readwrite.c
index ad89a3195039e..59f064e20ad97 100644
--- a/sys/ufs/ufs/ufs_readwrite.c
+++ b/sys/ufs/ufs/ufs_readwrite.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_readwrite.c	8.11 (Berkeley) 5/8/95
- * $Id: ufs_readwrite.c,v 1.62 1999/08/01 06:04:52 alc Exp $
+ * $FreeBSD$
  */
 
 #define	BLKSIZE(a, b, c)	blksize(a, b, c)
diff --git a/sys/ufs/ufs/ufs_vfsops.c b/sys/ufs/ufs/ufs_vfsops.c
index 55eb12db35eff..f1284008a8166 100644
--- a/sys/ufs/ufs/ufs_vfsops.c
+++ b/sys/ufs/ufs/ufs_vfsops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_vfsops.c	8.8 (Berkeley) 5/20/95
- * $Id: ufs_vfsops.c,v 1.14 1999/04/27 11:18:43 phk Exp $
+ * $FreeBSD$
  */
 
 #include "opt_quota.h"
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index e474bdab5b18e..e95c5e962c87a 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_vnops.c	8.27 (Berkeley) 5/27/95
- * $Id: ufs_vnops.c,v 1.121 1999/08/23 20:35:21 bde Exp $
+ * $FreeBSD$
  */
 
 #include "opt_quota.h"
diff --git a/sys/ufs/ufs/ufsmount.h b/sys/ufs/ufs/ufsmount.h
index 70652b58f9ba3..44974548e70a2 100644
--- a/sys/ufs/ufs/ufsmount.h
+++ b/sys/ufs/ufs/ufsmount.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufsmount.h	8.6 (Berkeley) 3/30/95
- * $Id: ufsmount.h,v 1.13 1998/01/30 11:34:06 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef _UFS_UFS_UFSMOUNT_H_
diff --git a/sys/vm/default_pager.c b/sys/vm/default_pager.c
index a850260dd7d61..91115f4115ac4 100644
--- a/sys/vm/default_pager.c
+++ b/sys/vm/default_pager.c
@@ -36,7 +36,7 @@
  * physically freed after having been cleaned and even then vm_page->swapblk
  * is maintained whenever a resident page also has swap backing store.
  *
- *	$Id: default_pager.c,v 1.18 1999/01/21 09:33:06 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/vm/default_pager.h b/sys/vm/default_pager.h
index 58911450a5ef0..842969accd4c8 100644
--- a/sys/vm/default_pager.h
+++ b/sys/vm/default_pager.h
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _DEFAULT_PAGER_H_
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c
index 0652b277cab4e..d08c14bc5d051 100644
--- a/sys/vm/device_pager.c
+++ b/sys/vm/device_pager.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)device_pager.c	8.1 (Berkeley) 6/11/93
- * $Id: device_pager.c,v 1.42 1999/05/13 04:02:07 luoqi Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h
index 32d1846e15b68..194ac283b309a 100644
--- a/sys/vm/pmap.h
+++ b/sys/vm/pmap.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: pmap.h,v 1.30 1999/04/23 20:29:57 dt Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 9ba1770569469..a3e603b1d70c7 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -64,7 +64,7 @@
  *
  *	@(#)swap_pager.c	8.9 (Berkeley) 3/21/94
  *
- * $Id: swap_pager.c,v 1.123 1999/08/17 05:56:00 alc Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/vm/swap_pager.h b/sys/vm/swap_pager.h
index 50acaf115dc70..4557036b8a50c 100644
--- a/sys/vm/swap_pager.h
+++ b/sys/vm/swap_pager.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)swap_pager.h	7.1 (Berkeley) 12/5/90
- *	$Id: swap_pager.h,v 1.23 1999/01/21 08:29:10 dillon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm.h b/sys/vm/vm.h
index 19ea10e5eb785..1fd27452dd039 100644
--- a/sys/vm/vm.h
+++ b/sys/vm/vm.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm.h	8.2 (Berkeley) 12/13/93
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef VM_H
diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h
index 93c9c606afa65..c8b90ba723203 100644
--- a/sys/vm/vm_extern.h
+++ b/sys/vm/vm_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_extern.h	8.2 (Berkeley) 1/12/94
- * $Id: vm_extern.h,v 1.41 1999/04/13 19:17:15 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _VM_EXTERN_H_
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index dd53ad9c57b71..7431e53418df3 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -66,7 +66,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_fault.c,v 1.103 1999/07/20 05:46:56 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index a83d029a57153..e53079a43a0f3 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -59,7 +59,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_glue.c,v 1.87 1999/07/21 18:02:26 alc Exp $
+ * $FreeBSD$
  */
 
 #include "opt_rlimit.h"
diff --git a/sys/vm/vm_inherit.h b/sys/vm/vm_inherit.h
index b3cfbd8126364..8d7b7f6df5010 100644
--- a/sys/vm/vm_inherit.h
+++ b/sys/vm/vm_inherit.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c
index 4eb8acce353f0..f7f1df84a1999 100644
--- a/sys/vm/vm_init.c
+++ b/sys/vm/vm_init.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_init.c,v 1.17 1998/02/04 22:33:45 eivind Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
index 6602ee57a7e0f..409c5f487fdeb 100644
--- a/sys/vm/vm_kern.c
+++ b/sys/vm/vm_kern.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_kern.c,v 1.57 1999/08/15 21:55:19 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_kern.h b/sys/vm/vm_kern.h
index 0f470bd3c7c85..9be497653d807 100644
--- a/sys/vm/vm_kern.h
+++ b/sys/vm/vm_kern.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_kern.h,v 1.18 1999/08/15 21:55:20 alc Exp $
+ * $FreeBSD$
  */
 
 #ifndef _VM_VM_KERN_H_
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 6ea4395b3b83a..03633e99d95cc 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_map.c,v 1.175 1999/08/10 04:50:20 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h
index f12c042cd6e8c..c5fbee562cbca 100644
--- a/sys/vm/vm_map.h
+++ b/sys/vm/vm_map.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_map.h,v 1.47 1999/08/23 18:08:34 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c
index 1f355d4e68288..4e7f0fb12c3d2 100644
--- a/sys/vm/vm_meter.c
+++ b/sys/vm/vm_meter.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_meter.c	8.4 (Berkeley) 1/4/94
- * $Id: vm_meter.c,v 1.30 1999/02/07 21:48:22 dillon Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index fe9bf90427b9c..9fb8458bc1a0a 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -38,7 +38,7 @@
  * from: Utah $Hdr: vm_mmap.c 1.6 91/10/21$
  *
  *	@(#)vm_mmap.c	8.4 (Berkeley) 1/12/94
- * $Id: vm_mmap.c,v 1.100 1999/06/05 18:21:53 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 7ff5175a73b91..0ed361db755e5 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_object.c,v 1.165 1999/08/15 21:55:20 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index 62e52e9ee2835..385ef70ca0df7 100644
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_object.h,v 1.58 1999/07/16 05:11:37 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index c384580c0175b..f6db00ef98a0f 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vm_page.c	7.4 (Berkeley) 5/7/91
- *	$Id: vm_page.c,v 1.140 1999/08/17 18:09:01 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index 7a93d18b2d500..6ffb8676eebb6 100644
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_page.h,v 1.69 1999/08/17 04:02:33 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index 7ce3a3a7f7a82..bc8784cc587d5 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -65,7 +65,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pageout.c,v 1.145 1999/08/17 00:07:35 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_pageout.h b/sys/vm/vm_pageout.h
index 68c0561fc5e80..7af6b06ff0f18 100644
--- a/sys/vm/vm_pageout.h
+++ b/sys/vm/vm_pageout.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pageout.h,v 1.23 1998/01/22 17:30:43 dyson Exp $
+ * $FreeBSD$
  */
 
 #ifndef _VM_VM_PAGEOUT_H_
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index f4639e5b34218..70452ed04ebdd 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pager.c,v 1.50 1999/07/04 00:25:38 mckusick Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_pager.h b/sys/vm/vm_pager.h
index aff14ab29aef9..d5df7c8f0ec7e 100644
--- a/sys/vm/vm_pager.h
+++ b/sys/vm/vm_pager.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_pager.h	8.4 (Berkeley) 1/12/94
- * $Id: vm_pager.h,v 1.21 1999/03/14 09:20:00 julian Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_param.h b/sys/vm/vm_param.h
index a3680c48c693e..66733cc4b1ca1 100644
--- a/sys/vm/vm_param.h
+++ b/sys/vm/vm_param.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_param.h,v 1.10 1999/06/20 04:55:29 alc Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_prot.h b/sys/vm/vm_prot.h
index cdddcea786a51..68e552e018adc 100644
--- a/sys/vm/vm_prot.h
+++ b/sys/vm/vm_prot.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_prot.h,v 1.7 1997/02/22 09:48:38 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c
index a2218cdbc4419..8a178bd895c83 100644
--- a/sys/vm/vm_swap.c
+++ b/sys/vm/vm_swap.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_swap.c	8.5 (Berkeley) 2/17/94
- * $Id: vm_swap.c,v 1.83 1999/08/24 05:58:35 green Exp $
+ * $FreeBSD$
  */
 
 #include "opt_swap.h"
diff --git a/sys/vm/vm_unix.c b/sys/vm/vm_unix.c
index d095283888ba9..f81101b2e78a9 100644
--- a/sys/vm/vm_unix.c
+++ b/sys/vm/vm_unix.c
@@ -38,7 +38,7 @@
  * from: Utah $Hdr: vm_unix.c 1.1 89/11/07$
  *
  *	@(#)vm_unix.c	8.1 (Berkeley) 6/11/93
- * $Id: vm_unix.c,v 1.20 1999/02/09 01:39:29 dillon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vm_zone.c b/sys/vm/vm_zone.c
index 0d684a74d3216..3befc9119c006 100644
--- a/sys/vm/vm_zone.c
+++ b/sys/vm/vm_zone.c
@@ -11,7 +11,7 @@
  * 2. Absolutely no warranty of function or purpose is made by the author
  *	John S. Dyson.
  *
- * $Id: vm_zone.c,v 1.25 1999/01/08 17:31:29 eivind Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sys/vm/vm_zone.h b/sys/vm/vm_zone.h
index 8fe91d1e1aaf0..b8aa933b3c37a 100644
--- a/sys/vm/vm_zone.h
+++ b/sys/vm/vm_zone.h
@@ -11,7 +11,7 @@
  * 2. Absolutely no warranty of function or purpose is made by the author
  *	John S. Dyson.
  *
- * $Id: vm_zone.h,v 1.11 1999/01/08 17:31:30 eivind Exp $
+ * $FreeBSD$
  */
 
 #ifndef _SYS_ZONE_H
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index c44391c1ee975..367d3a39f3981 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -38,7 +38,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)vnode_pager.c	7.5 (Berkeley) 4/20/91
- *	$Id: vnode_pager.c,v 1.112 1999/07/01 19:53:43 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/vm/vnode_pager.h b/sys/vm/vnode_pager.h
index b833e635ff269..339851d21b656 100644
--- a/sys/vm/vnode_pager.h
+++ b/sys/vm/vnode_pager.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vnode_pager.h	8.1 (Berkeley) 6/11/93
- * $Id: vnode_pager.h,v 1.11 1998/02/26 06:39:59 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifndef	_VNODE_PAGER_
author	Peter Wemm <peter@FreeBSD.org>	1999-08-28 01:08:13 +0000
committer	Peter Wemm <peter@FreeBSD.org>	1999-08-28 01:08:13 +0000
commit	c3aac50f284c6cca5b4f2eb46aaa13812cb8b630 (patch)
tree	399ca96df93caf6a718d5c0499575d187c3c753c /sys
parent	7f3dea244c40159a41ab22da77a434d7c5b5e85a (diff)