diff --git a/bin/chflags/chflags.1 b/bin/chflags/chflags.1
index 99424f8a437..1af45709cbd 100644
--- a/bin/chflags/chflags.1
+++ b/bin/chflags/chflags.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chflags.1	8.2 (Berkeley) 3/31/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd March 31, 1994
 .Dt CHFLAGS 1
diff --git a/lib/libpam/modules/pam_login_access/login.access.5 b/lib/libpam/modules/pam_login_access/login.access.5
index ff6d21cc14f..10788ed38e6 100644
--- a/lib/libpam/modules/pam_login_access/login.access.5
+++ b/lib/libpam/modules/pam_login_access/login.access.5
@@ -1,5 +1,5 @@
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .\" this is comment
 .Dd April 30, 1994
diff --git a/share/colldef/Makefile b/share/colldef/Makefile
index 8bffc4e625a..b828085c3b5 100644
--- a/share/colldef/Makefile
+++ b/share/colldef/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.22 1999/06/05 03:03:57 julian Exp $
+# $FreeBSD$
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
diff --git a/share/colldef/de_DE.DIS_8859-15.src b/share/colldef/de_DE.DIS_8859-15.src
index e952d169902..f5d609346cc 100644
--- a/share/colldef/de_DE.DIS_8859-15.src
+++ b/share/colldef/de_DE.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # German/ISO 8859-1 (backward compatible with ASCII)
 #
-# $Id: de_DE.DIS_8859-15.src,v 1.2 1999/02/12 21:14:41 ache Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 substitute <ss> with "ss"
diff --git a/share/colldef/de_DE.ISO8859-1.src b/share/colldef/de_DE.ISO8859-1.src
index f366e97d291..52d155d75a5 100644
--- a/share/colldef/de_DE.ISO8859-1.src
+++ b/share/colldef/de_DE.ISO8859-1.src
@@ -1,6 +1,6 @@
 # German/ISO 8859-1 (backward compatible with ASCII)
 #
-# $Id: de_DE.ISO_8859-1.src,v 1.5 1999/02/12 21:14:41 ache Exp $
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 substitute <ss> with "ss"
diff --git a/share/colldef/de_DE.ISO8859-15.src b/share/colldef/de_DE.ISO8859-15.src
index e952d169902..f5d609346cc 100644
--- a/share/colldef/de_DE.ISO8859-15.src
+++ b/share/colldef/de_DE.ISO8859-15.src
@@ -1,6 +1,6 @@
 # German/ISO 8859-1 (backward compatible with ASCII)
 #
-# $Id: de_DE.DIS_8859-15.src,v 1.2 1999/02/12 21:14:41 ache Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 substitute <ss> with "ss"
diff --git a/share/colldef/de_DE.ISO_8859-1.src b/share/colldef/de_DE.ISO_8859-1.src
index f366e97d291..52d155d75a5 100644
--- a/share/colldef/de_DE.ISO_8859-1.src
+++ b/share/colldef/de_DE.ISO_8859-1.src
@@ -1,6 +1,6 @@
 # German/ISO 8859-1 (backward compatible with ASCII)
 #
-# $Id: de_DE.ISO_8859-1.src,v 1.5 1999/02/12 21:14:41 ache Exp $
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 substitute <ss> with "ss"
diff --git a/share/colldef/de_DE.ISO_8859-15.src b/share/colldef/de_DE.ISO_8859-15.src
index e952d169902..f5d609346cc 100644
--- a/share/colldef/de_DE.ISO_8859-15.src
+++ b/share/colldef/de_DE.ISO_8859-15.src
@@ -1,6 +1,6 @@
 # German/ISO 8859-1 (backward compatible with ASCII)
 #
-# $Id: de_DE.DIS_8859-15.src,v 1.2 1999/02/12 21:14:41 ache Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 substitute <ss> with "ss"
diff --git a/share/colldef/es_ES.DIS_8859-15.src b/share/colldef/es_ES.DIS_8859-15.src
index d31a73bf037..002b63503d5 100644
--- a/share/colldef/es_ES.DIS_8859-15.src
+++ b/share/colldef/es_ES.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # Espan~ol (backward compatible with ASCII)
 #
-# $Id: es_ES.DIS_8859-15.src,v 1.3 1997/02/22 19:54:35 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/share/colldef/es_ES.ISO8859-1.src b/share/colldef/es_ES.ISO8859-1.src
index e088e21b5c4..7c2b21fc595 100644
--- a/share/colldef/es_ES.ISO8859-1.src
+++ b/share/colldef/es_ES.ISO8859-1.src
@@ -1,6 +1,6 @@
 # Espan~ol (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 order \
diff --git a/share/colldef/es_ES.ISO8859-15.src b/share/colldef/es_ES.ISO8859-15.src
index d31a73bf037..002b63503d5 100644
--- a/share/colldef/es_ES.ISO8859-15.src
+++ b/share/colldef/es_ES.ISO8859-15.src
@@ -1,6 +1,6 @@
 # Espan~ol (backward compatible with ASCII)
 #
-# $Id: es_ES.DIS_8859-15.src,v 1.3 1997/02/22 19:54:35 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/share/colldef/es_ES.ISO_8859-1.src b/share/colldef/es_ES.ISO_8859-1.src
index e088e21b5c4..7c2b21fc595 100644
--- a/share/colldef/es_ES.ISO_8859-1.src
+++ b/share/colldef/es_ES.ISO_8859-1.src
@@ -1,6 +1,6 @@
 # Espan~ol (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 order \
diff --git a/share/colldef/es_ES.ISO_8859-15.src b/share/colldef/es_ES.ISO_8859-15.src
index d31a73bf037..002b63503d5 100644
--- a/share/colldef/es_ES.ISO_8859-15.src
+++ b/share/colldef/es_ES.ISO_8859-15.src
@@ -1,6 +1,6 @@
 # Espan~ol (backward compatible with ASCII)
 #
-# $Id: es_ES.DIS_8859-15.src,v 1.3 1997/02/22 19:54:35 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/share/colldef/is_IS.DIS_8859-15.src b/share/colldef/is_IS.DIS_8859-15.src
index 605a8433ae1..fe4dd9beae8 100644
--- a/share/colldef/is_IS.DIS_8859-15.src
+++ b/share/colldef/is_IS.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # icelandic (backward compatible with ASCII)
 #
-# $Id: is_IS.DIS_8859-15.src,v 1.4 1997/02/22 19:54:38 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/share/colldef/is_IS.ISO8859-1.src b/share/colldef/is_IS.ISO8859-1.src
index 288459c0b3f..50cd9a95ca8 100644
--- a/share/colldef/is_IS.ISO8859-1.src
+++ b/share/colldef/is_IS.ISO8859-1.src
@@ -1,6 +1,6 @@
 # icelandic (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 order \
diff --git a/share/colldef/is_IS.ISO8859-15.src b/share/colldef/is_IS.ISO8859-15.src
index 605a8433ae1..fe4dd9beae8 100644
--- a/share/colldef/is_IS.ISO8859-15.src
+++ b/share/colldef/is_IS.ISO8859-15.src
@@ -1,6 +1,6 @@
 # icelandic (backward compatible with ASCII)
 #
-# $Id: is_IS.DIS_8859-15.src,v 1.4 1997/02/22 19:54:38 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/share/colldef/is_IS.ISO_8859-1.src b/share/colldef/is_IS.ISO_8859-1.src
index 288459c0b3f..50cd9a95ca8 100644
--- a/share/colldef/is_IS.ISO_8859-1.src
+++ b/share/colldef/is_IS.ISO_8859-1.src
@@ -1,6 +1,6 @@
 # icelandic (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 order \
diff --git a/share/colldef/is_IS.ISO_8859-15.src b/share/colldef/is_IS.ISO_8859-15.src
index 605a8433ae1..fe4dd9beae8 100644
--- a/share/colldef/is_IS.ISO_8859-15.src
+++ b/share/colldef/is_IS.ISO_8859-15.src
@@ -1,6 +1,6 @@
 # icelandic (backward compatible with ASCII)
 #
-# $Id: is_IS.DIS_8859-15.src,v 1.4 1997/02/22 19:54:38 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/share/colldef/la_LN.ASCII.src b/share/colldef/la_LN.ASCII.src
index 525ebb97970..df3c3408876 100644
--- a/share/colldef/la_LN.ASCII.src
+++ b/share/colldef/la_LN.ASCII.src
@@ -1,6 +1,6 @@
 # ASCII
 #
-# $Id: lt_LN.ISO_8859-1.src,v 1.8 1997/02/22 19:54:39 peter Exp $
+# $FreeBSD$
 #
 order \
 	\x00;...;\xff
diff --git a/share/colldef/la_LN.DIS_8859-15.src b/share/colldef/la_LN.DIS_8859-15.src
index 71de5833870..449ce85e633 100644
--- a/share/colldef/la_LN.DIS_8859-15.src
+++ b/share/colldef/la_LN.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # latin1 (backward compatible with ASCII)
 #
-# $Id: lt_LN.DIS_8859-15.src,v 1.8 1997/02/22 19:54:39 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/share/colldef/la_LN.ISO8859-1.src b/share/colldef/la_LN.ISO8859-1.src
index 93a2da01484..99b7d08ddb0 100644
--- a/share/colldef/la_LN.ISO8859-1.src
+++ b/share/colldef/la_LN.ISO8859-1.src
@@ -1,6 +1,6 @@
 # latin1 (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 order \
diff --git a/share/colldef/la_LN.ISO8859-15.src b/share/colldef/la_LN.ISO8859-15.src
index 71de5833870..449ce85e633 100644
--- a/share/colldef/la_LN.ISO8859-15.src
+++ b/share/colldef/la_LN.ISO8859-15.src
@@ -1,6 +1,6 @@
 # latin1 (backward compatible with ASCII)
 #
-# $Id: lt_LN.DIS_8859-15.src,v 1.8 1997/02/22 19:54:39 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/share/colldef/la_LN.ISO8859-2.src b/share/colldef/la_LN.ISO8859-2.src
index 772fe322038..aee3671f096 100644
--- a/share/colldef/la_LN.ISO8859-2.src
+++ b/share/colldef/la_LN.ISO8859-2.src
@@ -1,6 +1,6 @@
 # latin2 (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-2
 order \
diff --git a/share/colldef/la_LN.ISO_8859-1.src b/share/colldef/la_LN.ISO_8859-1.src
index 93a2da01484..99b7d08ddb0 100644
--- a/share/colldef/la_LN.ISO_8859-1.src
+++ b/share/colldef/la_LN.ISO_8859-1.src
@@ -1,6 +1,6 @@
 # latin1 (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 order \
diff --git a/share/colldef/la_LN.ISO_8859-15.src b/share/colldef/la_LN.ISO_8859-15.src
index 71de5833870..449ce85e633 100644
--- a/share/colldef/la_LN.ISO_8859-15.src
+++ b/share/colldef/la_LN.ISO_8859-15.src
@@ -1,6 +1,6 @@
 # latin1 (backward compatible with ASCII)
 #
-# $Id: lt_LN.DIS_8859-15.src,v 1.8 1997/02/22 19:54:39 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/share/colldef/la_LN.ISO_8859-2.src b/share/colldef/la_LN.ISO_8859-2.src
index 772fe322038..aee3671f096 100644
--- a/share/colldef/la_LN.ISO_8859-2.src
+++ b/share/colldef/la_LN.ISO_8859-2.src
@@ -1,6 +1,6 @@
 # latin2 (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-2
 order \
diff --git a/share/colldef/la_LN.US-ASCII.src b/share/colldef/la_LN.US-ASCII.src
index 525ebb97970..df3c3408876 100644
--- a/share/colldef/la_LN.US-ASCII.src
+++ b/share/colldef/la_LN.US-ASCII.src
@@ -1,6 +1,6 @@
 # ASCII
 #
-# $Id: lt_LN.ISO_8859-1.src,v 1.8 1997/02/22 19:54:39 peter Exp $
+# $FreeBSD$
 #
 order \
 	\x00;...;\xff
diff --git a/share/colldef/lt_LN.ASCII.src b/share/colldef/lt_LN.ASCII.src
index 525ebb97970..df3c3408876 100644
--- a/share/colldef/lt_LN.ASCII.src
+++ b/share/colldef/lt_LN.ASCII.src
@@ -1,6 +1,6 @@
 # ASCII
 #
-# $Id: lt_LN.ISO_8859-1.src,v 1.8 1997/02/22 19:54:39 peter Exp $
+# $FreeBSD$
 #
 order \
 	\x00;...;\xff
diff --git a/share/colldef/lt_LN.DIS_8859-15.src b/share/colldef/lt_LN.DIS_8859-15.src
index 71de5833870..449ce85e633 100644
--- a/share/colldef/lt_LN.DIS_8859-15.src
+++ b/share/colldef/lt_LN.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # latin1 (backward compatible with ASCII)
 #
-# $Id: lt_LN.DIS_8859-15.src,v 1.8 1997/02/22 19:54:39 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/share/colldef/lt_LN.ISO_8859-1.src b/share/colldef/lt_LN.ISO_8859-1.src
index 93a2da01484..99b7d08ddb0 100644
--- a/share/colldef/lt_LN.ISO_8859-1.src
+++ b/share/colldef/lt_LN.ISO_8859-1.src
@@ -1,6 +1,6 @@
 # latin1 (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 order \
diff --git a/share/colldef/lt_LN.ISO_8859-2.src b/share/colldef/lt_LN.ISO_8859-2.src
index 772fe322038..aee3671f096 100644
--- a/share/colldef/lt_LN.ISO_8859-2.src
+++ b/share/colldef/lt_LN.ISO_8859-2.src
@@ -1,6 +1,6 @@
 # latin2 (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-2
 order \
diff --git a/share/colldef/ru_RU.CP866.src b/share/colldef/ru_RU.CP866.src
index 88ca377082a..2fc2d20835c 100644
--- a/share/colldef/ru_RU.CP866.src
+++ b/share/colldef/ru_RU.CP866.src
@@ -1,6 +1,6 @@
 # CP866 (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.CP866
 order \
diff --git a/share/colldef/ru_RU.KOI8-R.src b/share/colldef/ru_RU.KOI8-R.src
index f6b0a1877be..3a67bc4e39f 100644
--- a/share/colldef/ru_RU.KOI8-R.src
+++ b/share/colldef/ru_RU.KOI8-R.src
@@ -1,6 +1,6 @@
 # koi8-r (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.KOI8-R
 order \
diff --git a/share/colldef/ru_SU.CP866.src b/share/colldef/ru_SU.CP866.src
index 88ca377082a..2fc2d20835c 100644
--- a/share/colldef/ru_SU.CP866.src
+++ b/share/colldef/ru_SU.CP866.src
@@ -1,6 +1,6 @@
 # CP866 (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.CP866
 order \
diff --git a/share/colldef/ru_SU.KOI8-R.src b/share/colldef/ru_SU.KOI8-R.src
index f6b0a1877be..3a67bc4e39f 100644
--- a/share/colldef/ru_SU.KOI8-R.src
+++ b/share/colldef/ru_SU.KOI8-R.src
@@ -1,6 +1,6 @@
 # koi8-r (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.KOI8-R
 order \
diff --git a/share/mklocale/Makefile b/share/mklocale/Makefile
index 2ef612c9f74..1c446a9ca13 100644
--- a/share/mklocale/Makefile
+++ b/share/mklocale/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.18 1999/06/05 03:04:00 julian Exp $
+# $FreeBSD$
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
diff --git a/share/mklocale/la_LN.ISO8859-2.src b/share/mklocale/la_LN.ISO8859-2.src
index 3f9ad913e06..a9fa03fc89e 100644
--- a/share/mklocale/la_LN.ISO8859-2.src
+++ b/share/mklocale/la_LN.ISO8859-2.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for the iso_8859_2 Locale
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 ENCODING	"NONE"
diff --git a/share/mklocale/la_LN.ISO_8859-2.src b/share/mklocale/la_LN.ISO_8859-2.src
index 3f9ad913e06..a9fa03fc89e 100644
--- a/share/mklocale/la_LN.ISO_8859-2.src
+++ b/share/mklocale/la_LN.ISO_8859-2.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for the iso_8859_2 Locale
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 ENCODING	"NONE"
diff --git a/share/mklocale/lt_LN.ISO_8859-2.src b/share/mklocale/lt_LN.ISO_8859-2.src
index 3f9ad913e06..a9fa03fc89e 100644
--- a/share/mklocale/lt_LN.ISO_8859-2.src
+++ b/share/mklocale/lt_LN.ISO_8859-2.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for the iso_8859_2 Locale
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 ENCODING	"NONE"
diff --git a/share/mklocale/zh_CN.EUC.src b/share/mklocale/zh_CN.EUC.src
index 1680f3cc199..b298ef5de56 100644
--- a/share/mklocale/zh_CN.EUC.src
+++ b/share/mklocale/zh_CN.EUC.src
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: zh_CN.EUC.src,v 1.1 1998/08/10 09:49:42 phk Exp $
+ * $FreeBSD$
  */
 
 ENCODING	"EUC"
diff --git a/share/mklocale/zh_CN.eucCN.src b/share/mklocale/zh_CN.eucCN.src
index 1680f3cc199..b298ef5de56 100644
--- a/share/mklocale/zh_CN.eucCN.src
+++ b/share/mklocale/zh_CN.eucCN.src
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: zh_CN.EUC.src,v 1.1 1998/08/10 09:49:42 phk Exp $
+ * $FreeBSD$
  */
 
 ENCODING	"EUC"
diff --git a/sys/Makefile b/sys/Makefile
index fd892f3e86b..007745683a7 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 5eb23b2d47d..19132522aeb 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 74daa01caa8..4eafc4f2ce7 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 b2267af998e..cfc81155021 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 08848813955..bd51ddd0c43 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 95a2e093a55..80c6849c5ee 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 cacc31cd1c4..b9b2b313fa3 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 4e3e4a53366..98970b91fdc 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 d2a78f491e4..20884072c0a 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 597415c9076..19a7bd5aa20 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 e255caca60d..d205d38e0a3 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 7116f7d28c5..bd72d02cc82 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 646e3536573..5582fcb1337 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 43828ca0b9f..417c5ddd921 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 a01642afc0a..ad07a8ea597 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 945f537aadd..dc838f71ace 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 d2aaa8d4836..c58025e2b77 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 fe660e249b0..d6fa59f8945 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 1977e910a0e..ae5b8701a94 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 cbebc65853a..94502135958 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 02266e090b8..1e4d07d6950 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 33042be0f41..fe761c69135 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 51639ee3e03..510cc468b0f 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 0378f765415..5c877f120e7 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 d2f5076cbe4..9a23ce4542b 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 62132f5b0e5..411b4a4ee19 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 cfaa023fd01..000eb02a0a7 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 f3dbde81ad6..7a2d0e46b8f 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 e91857f9f81..49f662ae1d6 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 0b2bbaa7bb5..13668f08cef 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 493a2b15d4a..94517e79936 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 5b45b49b950..e7b6873c58d 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 68727ebf91f..4c263bdd68d 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 0339d18d64c..9a85e97bc6d 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 12071675322..0bfd7fc8cd6 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 94359373997..cbd42bc57b1 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 4f92cf697bf..2f0dabb9480 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 211a6ffb1c7..6a30b4f3491 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 d6d3c1a063b..dfd267a6906 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 211a6ffb1c7..6a30b4f3491 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 d20872d5245..14073c4a740 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 f686745666c..a6de7cd2c0a 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 52ef13c794f..73d380047bc 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 8c22063abca..b1110c18386 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 d78c2205e96..fdc5b7d7524 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 c8adc82fb0a..99ca2d89843 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 80eb3078a30..3e2bfb0fa3d 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 09413e7d49f..f9b1f424114 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 8be98c10e0c..d003ca91010 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 25a27d57f00..d8b0499fd4d 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 cd45e408d85..86b7e7a729b 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 52a7c694f97..5fb1ccf7d4b 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 c7f50f78dbb..f111ca9a7ba 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 286298e1968..1e437c86a66 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 5489e3a4e66..bbc3142d892 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 e9dbe87bdf1..18792f1e522 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 e1915230a84..f243f8b2033 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 928a05aa0fe..cddefe118ed 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 8326970978c..eb225261071 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 6257ed87453..892d96d0337 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 f14c0fa30a2..fe6bcc21114 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 5b1fd006319..67e4540eb42 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 de8d599c9d1..1a3d871d752 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 c9efceed029..66c55772242 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 8af1d716251..95c0a93c2a1 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 701f22c2b5b..654d6ee8612 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 a838e989195..b357101c0ce 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 7e1c0f0dee4..7691d71efad 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 27011848b17..b4088bc009c 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 ea5408920b8..4f003886ec1 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 cd9e7017315..d32494281fb 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 970d2470410..46f57baa95c 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 79e83f3d101..956e141ca16 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 c8adc82fb0a..99ca2d89843 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 f10c60f4c5d..c2ae0fab148 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 94e87ffd7d8..42d40f3f2df 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 a8ef501bc34..e2df622a0c0 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 c3d8b31a0fd..b3393ce70c5 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 0fbbf957176..873ea8504b4 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 5da68ea44b8..d85f674478d 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 f13c374c26a..fad568c0cb8 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 078238ec0d4..d1b777fc613 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 d5d19e4603f..5b214086311 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 a6d4a18bde2..3caa144f8e4 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 3b2f9c759cc..321326ff40a 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 68add90c725..b2a28df6eb4 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 065ae3f090c..0eb8ef28209 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 b54c48edbc1..9fcb9723326 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 4981272d48f..8ceb6a5f377 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 27f3b242308..d69c5474fb5 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 40569a0089c..341a3965917 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 279c8db5d31..c9253c9dc0d 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 bf9bac25c52..5fcfe2ab55f 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 65299c746a7..08ccbc7b7a4 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 eb335c06398..07eaba12425 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 2fa81e60b87..2003b7bd4e1 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 5c84a49a750..4b6397aecce 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 e0e0a6b9b61..8eda490525e 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 f293bc5268d..03e186996b3 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 f7a11b985ef..d355ec8ac93 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 04c62a65a54..b055549c3ab 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 920751f10ed..19b8ca54e3e 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 2cb3e2c70d5..4fcdc6b6913 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 0eee66e687c..a77cb35adc1 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 da310f03629..4eee37acb4c 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 d399ad080a3..c062c96ec17 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 93fafa2a371..4e5db53e99c 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 5d5169d9968..c76402c31e6 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 99a88a510f6..5d962a6c04d 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 6c626bca01d..871ccfbed4c 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 d1e1425ed5a..01e25880123 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 369ee6ffd3a..5e6ce0719a2 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 9d95446f6ed..2f8a2399714 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 91813178342..7a0573b2f36 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 0104b4fbb24..a5fa82e2511 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 43d6bc3184e..4251e06be6f 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 fdf0016d65c..73da41a852f 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 edd79c72d88..8da36a401ed 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 6f60c1519ae..1e50032dec9 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 d60a6646ab6..a510004ada9 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 f74840fa4a0..10a5a2aad01 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 53f036dea00..1619539b5a2 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 bcde9ecb9b3..d49a57c60d4 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 38b51b772e9..27c5ffa00ef 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 1af09c1c829..6f7af8820f1 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 64e4fcd2d6d..60b19a3bc65 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 0c341156243..f82351f702f 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 41c17330b9c..a27d712d7a6 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 71d92d970a3..dc3f56a520b 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 cce6c252141..a5968fa8fd0 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 71329252140..eafdeb3bd1e 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 336e0fb8c12..7bba66d2686 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 4f30d1cae08..5c6ddb474ea 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 b64b7740268..72e26411efc 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 4befcf474b2..b607dd082cb 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 d672e77ee38..2988db2f6a8 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 53f3f80c28b..9353ab21975 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 5771d222a60..d779e56315a 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 f7ca6d6dd2e..d1f9db8a2c9 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 cb48da0ef57..d7747a7546b 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 813d60d3372..adbede9ecb8 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 31e30e5d3e8..7101582da71 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 fd9ed461711..be394eadded 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 b6b51db3e77..16d15522489 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 683f3d368b9..493b5ac0c0f 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 cdbae33005e..993fd390357 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 61c054c12fb..214fcd0c888 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 6736fec7476..b45737d7322 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 d07811e799e..f69251506b8 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 6c24281575c..da48eb802f1 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 e1c15e8aaf7..72b631bfc38 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 80751688c71..e64eaab955b 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 17e72096826..d23ad4a3e01 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 1df3e65a7e6..fbf21ec8207 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 86a5686da34..1eb95e9bd43 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 5ece6e0c850..cc0bd8e4783 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 889f97d575b..0daf0aaae92 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 dc2036b266e..8ebeb316973 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 56168e62e8e..2bdb24882dd 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 535e3908711..02759b9afb4 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 6b72785216f..f8690b4a40c 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 04ea7ee3d1c..37a94676f67 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 36cda9348f3..f087a7ba55f 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 7ff35062d59..84701544274 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 28362ba9dc7..c173c4fb1d7 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 d971aa95f02..33342b92227 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 6a7bcf059a1..f484971eab2 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 d7a5c495d6d..c19ba9e027b 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 4c5dbd34bb5..f678609719d 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 baf20187da6..5fc0a429673 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 bebec68ceca..c16333ced11 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 fb6c1ff9368..ee277419c36 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 b3b30b13f3f..16e8106d5e7 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 0ad6dfbfd56..cb7f228d671 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 6a361a0052f..074b4e639bc 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 2814f066e0f..51a2e77541f 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 dce98e87e5b..f19622475bb 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 dce98e87e5b..f19622475bb 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 a99b5674ea4..374c0661701 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 9f17b0c7d61..2df51826821 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 ba53f4eab87..0f1e86d6773 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 a58caadce1b..a56bb36d91a 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 0c28185a347..22e98eda710 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 95b55613bf4..f2627266353 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 95b55613bf4..f2627266353 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 dfde63760a8..a3c33bfc293 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 c835a6ee2cc..ab31e7095ea 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 969cd089249..283ed1701a3 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 962bafcc779..d21354e3c79 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 969cd089249..283ed1701a3 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 0c28185a347..22e98eda710 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 791060a03f8..6129ed86f48 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 34479056ed7..d934ee56eee 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 7093dbb86df..ae99af947ab 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 7093dbb86df..ae99af947ab 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 fb6c1ff9368..ee277419c36 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 76b45ff8c32..0f5930ca7a0 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 e717563e7ed..5e3ed49ee48 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 188e20bc0f4..8a3e1c93030 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 21bc706129c..b907f27c034 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 f889546e112..2011cfea73e 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 55e44e0bec2..38c70709e7c 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 f1023173b3d..7ac12436602 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 00bdf7affe4..92b9e1a5d70 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 e9f9403f619..b3fd514cbc9 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 28e80ba2b89..b6a9795a5ae 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 28e80ba2b89..b6a9795a5ae 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 28e80ba2b89..b6a9795a5ae 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 28e80ba2b89..b6a9795a5ae 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 ee58d5a24ef..3533a671fe8 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 4eb051e1819..8742dd195e0 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 03e2d79e20f..f5c654a6a64 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 d3e4ad47b9f..4a2fe79f41a 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 9c72d0db532..9618b252019 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 ece2509927a..93e01e26287 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 aaa32f66661..d5022d81e92 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 ac0cce3ee0e..756c08c0204 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 7670fd1cee1..c233b09655b 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 a0296ecc8c0..5cdbc97f7d4 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 cd2561f8b9d..c3e674f7f30 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 10384c6ebf9..2e7a31d2508 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 f339f01c43c..b212d6c7b77 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 ab4d529ea94..3c9c49ddda3 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 491eb46b024..755e1e72cce 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 969cd089249..283ed1701a3 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 10384c6ebf9..2e7a31d2508 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 1ea2f927319..3a317863812 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 9e64a3f1330..cd2d5ff35b7 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 5cee924dd9f..ed3044cc4d6 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 36d07e9e8ce..154cf949ba0 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 44556e7731a..34b3fc54aaa 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 c02009b8343..28336d70853 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 fd55bdcb2ef..b9f3f745a4e 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 ae6cd6337bc..bc2679e385c 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 e034e611e06..1d2b6009f52 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 5f1733587f8..6a7e233a840 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 2c43a2eef8d..55a26fd636a 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 994bdfda036..1f541c7b30d 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 ead0334ee22..ef4b8dbc3e8 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 1a6e20d91af..d043d8b5a11 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 c0337c06ce6..173ea2d92f8 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 51dc1960901..deaa06ca792 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 c425db6f7d3..0524d76b6fb 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 f6e04fa98cb..d95f9331f62 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 a9248389acd..009c7810259 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 96928d18996..6cc059a1e58 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 636133a9a87..2003a66609b 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 5661462e11f..d1d4ed0c090 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 9ec54e2d34a..0a5847dd5ff 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 cbb8b5ea49b..24ce97b666b 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 188e20bc0f4..8a3e1c93030 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 cfe4dceb087..14e8d14aa9b 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 0f3a3caeaa3..34753583a41 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 0f3a3caeaa3..34753583a41 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 cbb8b5ea49b..24ce97b666b 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 cbb8b5ea49b..24ce97b666b 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 3a214a99522..8bdb4b6d72d 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 06593cf359f..adea3037caa 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 8e153a71c62..f87d9816f07 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 ea25f20604e..cc66da9be04 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 7855aaa89fa..698c67004a7 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 3fe234c3422..15f8b3d804d 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 3a214a99522..8bdb4b6d72d 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 a99b5674ea4..374c0661701 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 ff27bacc24a..0bfd7fc8cd6 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 608f13586c3..5447a90126a 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 608f13586c3..5447a90126a 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 08cba7f52e0..741baa907f6 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 08cba7f52e0..741baa907f6 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 81dec0372be..a36f2cf53d6 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 7346c5b8085..e3f52a910ab 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 79f17025a95..4766c9a02c3 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 e4f439b8190..a105c7f1814 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 6346f50d0a0..bc9aa00ed9a 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 41400240b26..b9c5ff73658 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 b41276d76e7..49f662ae1d6 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 659618a83cc..13668f08cef 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 4928647b754..fe642eb1336 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 b77ee12e3ab..870296b6547 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 196915c1eb2..95b6cba677e 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 afa065f5bd0..4ac21d42242 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 5529035ff43..94aa4bbff07 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 fa0842b5916..5513583bbb6 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 8acd3f93e47..ff184763dd8 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 a7621b76bbb..faaf9829c3d 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 dcd07ede1fc..d8ee1133299 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 0958b956325..4efd603e3d6 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 f234a37256c..13f1e53e1bf 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 79b231a5c4b..8e1dd71e09f 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 c33f317d52b..d411318b54a 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 380326ccd0e..e32d43d3b66 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 6d5e0874bdb..184f1d3c9f0 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 b4d3cac7570..be57632ddd9 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 35750ec0f2a..3361c6c9034 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 6b7d17b8e76..6039a728916 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 d15fa5f151d..d36e557bc1f 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 f42b5da4c95..fcc5406a018 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 7b87d2fdcc6..18af172558c 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 8a0e10bad07..354f9cd1a90 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 6346f50d0a0..bc9aa00ed9a 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 4b0436976de..82043c438af 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 cc4e48d35a6..25c74465b3f 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 e9c73d308f6..b823e49baba 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 716215950c7..085d6bbc8ee 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 ec5b6bc75de..023821cdae1 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 00480612635..4e5951bb50b 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 e8ecb227ab5..9607b6b1c61 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 5a6be39b314..2b548546416 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 2ca13976681..2847812fed0 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 ac56c824c1b..49234615575 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 24502a4f043..8e153f7ddd7 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 af038e9f0e0..1b4fc598d6a 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 949a93c674d..8b74e0d2c06 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 67b0bf61cb6..e897b4ec749 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 595c7d22ce2..56c8c43d510 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 84637592c67..4e75820a88c 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 367bf0cb073..a6a39978eab 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 abf2d399199..5f13801a821 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 c68ca02e498..9c005e1e9b3 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 81589702519..bf0ba1ab23b 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 1b5384c63f4..d40ea46fe06 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 d086a59d6fc..ccee80fc485 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 79874ea278d..49f662ae1d6 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 9fffaf7b1f7..13668f08cef 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 23262b91677..bc9aa00ed9a 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 c29494ba6ae..0d1dc1411c5 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 d780038c07a..c52854ece5f 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 70b46714463..f69d4302d16 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 1cabf703345..9138b56e326 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 cc75032e72c..aa81abcf15b 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 8c4377f2bcd..3f2a8790118 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 a66523a08ac..cf12680c313 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 7c256ffb2ba..3b3d10728a3 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 83489c6dd24..77d6ffac985 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 9927e8ae457..a78e456de16 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 897f1175d83..4f321bd31c4 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 6de118ec63f..6325e4ef348 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 4f653275c78..8b965ff8674 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 6c387106ab8..0f83c430766 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 865e8f683e1..19417068601 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 d1311b27aa0..3ebd66a0d23 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 d59fdf398c4..e91c5fb8b56 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 3e6aeced5d7..8947a738417 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 bc514b1bc3a..024fece0718 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 27268bb59f7..ef847c10e68 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 73f805700bf..ef99d7067a9 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 1376c53aee3..9741ed3663e 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 36600e76485..819d4a46594 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 01416596ce2..d2adeab03e7 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 bee6a0327df..bad1e45c5dc 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 62d35a81938..f2e262070d9 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 ab107162070..5f724bbcaf3 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 9ebeacba01c..96205c0808d 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 e219b56f295..9f40cb2053c 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 3a421386209..3aedb666801 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 8bc0ec5dff1..c860ae29c19 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 c4114ff7f39..8a76f8247e0 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 20126ccfa0c..5f594ef5612 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 27b23065676..2ee6e63a519 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 7bbeb6573e1..5ccddf25029 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 72be7ed475a..d318d2a07e8 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 cc11f192902..00c63914604 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 25ec504a0ac..578b452c605 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 d1707efff73..d78aaf29b4a 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 966d8c646c4..94dd13bd18b 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 d1707efff73..d78aaf29b4a 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 67c5ec85289..eefcf086c5f 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 493c4d8fda0..4bb93cfe9d3 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 92237b852b7..e29820586a3 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 92237b852b7..e29820586a3 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 75a170e53c7..39f78ed639b 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 6657f6e266c..c29339d569e 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 29b97950a70..b3f3150e84a 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 598db02a203..70649bbb6c9 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 29b97950a70..b3f3150e84a 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 32cb4adb0b8..33e6275360b 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 5d3b301e0f5..92748f1abaf 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 5d3b301e0f5..92748f1abaf 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 e6fb7581889..40c65657ea7 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 9b3e4c24e19..f08ae754f82 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 16e3228a50e..9c77b4295e7 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 1e7717f069c..1152f8b1d96 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 46709a39540..0d7d1116322 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 25ec504a0ac..578b452c605 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 67c5ec85289..eefcf086c5f 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 2d1e840f5a4..bb97590301d 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 0313be7b34c..cbcd498fadd 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 4c0474755d4..cfb479fd2d8 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 7f18c7e0b5d..5cd5b44b600 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 f763f311927..ebec384a0b2 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 78fd6ca3137..bb354e297dd 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 d565cecfbf5..550fa526d94 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 2cfd2e34595..e28ac4acc04 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 96d74d81d00..b81e5515538 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 00c38eeb4a6..2b5ba095b08 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 92f4fd28c29..483384c2c15 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 a6064ba2746..616a22cdc45 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 a07012e061b..8363b9fd25a 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 a07012e061b..8363b9fd25a 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 a07012e061b..8363b9fd25a 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 7b35d1dce8c..ee6fbc8f53a 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 418163edeae..dfa685eb1b8 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 130b0cab465..a3d3ef9412d 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 130b0cab465..a3d3ef9412d 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 130b0cab465..a3d3ef9412d 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 bb109dbe7cf..b85265489e7 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 3d75c760ed0..7040e9fcd30 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 a7be8514830..1868faa9c2b 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 36ffb014cdb..fb73f042216 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 05e77110c2e..a79bb05ce09 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 966d4369afe..e74d16f974f 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 9b4d554bc1a..6ffa49f6a43 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 27268bb59f7..ef847c10e68 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 dfd1bfffbb9..32777382063 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 ad310451c49..01f8500452c 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 ef206e5374d..1090ab02bb1 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 768e2628177..c8783b92059 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 f849fb2a0ab..6c030de1c79 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 dcd07ede1fc..d8ee1133299 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 380326ccd0e..e32d43d3b66 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 196915c1eb2..95b6cba677e 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 afa065f5bd0..4ac21d42242 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 72ce2cebd71..5d013df2dce 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 c7434725ccc..800306dde4d 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 01d47f20f01..f14c7f55104 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 2e0fcac85ab..6f4bcc39e52 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 4c667444ac3..88d9506c46b 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 df9d7fcb18e..df8e755062a 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 2104071add6..4e32192eebc 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 7aa768c5720..ad9d3ff74d8 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 6047364469d..dc5fb00f94c 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 fed109ebdc5..166881517b1 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 24459cdf6d0..a7e69355d62 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 591d43214d9..1b138b36d47 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 059ace23d03..b6e113a014a 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 b4c19e54926..39f78ed639b 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 b74deeaf18f..a856eda5304 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 d4e8d894ec0..eb191316c09 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 6526c6b29c6..70649bbb6c9 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 d4e8d894ec0..eb191316c09 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 5bd155c8331..b6f40162d23 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 6217eb234e7..cc8c6a1c06d 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 6217eb234e7..cc8c6a1c06d 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 e47e653872e..40c65657ea7 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 28b878be241..f08ae754f82 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 6273bfa45e7..9c77b4295e7 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 05708f2a3f2..1152f8b1d96 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 14b77674f3a..0d7d1116322 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 fad01497c9f..cde163e3e38 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 169452f8104..a82ef4a2ec3 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 92bb219b0ba..6b780f1767e 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 82e4642e7cc..958b4e01942 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 45e441012b5..cad48c1badc 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 7804b666675..db62063a432 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 e51a952db86..6d0af3895cd 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 4b7aa2f010f..0fabadfe5b8 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 4e11061752c..4c28e42954f 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 c182fd62828..7f656032edd 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 a44334568fb..c58a0a1b277 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 080575c66c6..fc777c17d39 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 6fa6d528291..aa1a50dec9b 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 8570a35dd6c..0802febac44 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 8aec51d391f..21ade23b40a 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 a73972cf05f..6ed5ddf76ef 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 2efee41c446..acb7bd64339 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 3ec7ad2006f..988a1a2f42e 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 36685259755..d3459315a7c 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 feaf9ed6949..c8843e24c82 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 53e7937b857..53250491163 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 0f92c6e3fac..d203aa1e94c 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 0ed413d9dfa..6d41f6c52f7 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 ee64e213ae9..111402f0450 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 267deeb7e4f..698e638dddb 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 1203699e78d..a1ea40251e2 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 9ced6c3c5fa..d6d802bfcea 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 f57ef1a8e95..a6d4ac819af 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 537090037e8..fd681a65f24 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 ac0af545f63..bcd752dc8a3 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 d9b95e319e1..88a0fcd81bb 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 b900c3b02f5..958e1664de1 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 12ad2e207c8..39e92c35227 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 92ed7b9b105..72350cb15c3 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 d965ee22b6e..b5eea824fcf 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 d393884ddad..d1d152755f5 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 ab2d1bc15a2..be52eca2856 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 3775b4d62b4..c5a5ec5c22e 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 5e7afc5610b..70a50ea52af 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 9c5c0595d18..d20c9b08fbc 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 ee4573d5102..75d29acc22e 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 db2ec539b00..5a25bc67f15 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 22a5963acd2..ea16d154b4f 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 e896ff0813b..6620f4f0c32 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 33b372f49b1..cc0fd957f81 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 63ee9f9772f..23425b5a13d 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 e4739114c2c..11f2e80b12b 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 e62c04d3db1..8661a07ebfa 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 57bc67ed002..2c2577ce57e 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 cde967f04c9..520702ba48d 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 11922adfe02..c6276f3e710 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 f64123321f3..aaf805c54ad 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 fe27bfda19c..71c8a3de381 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 9853c7e834b..f27357498d4 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 6fdd15c60fa..392a73f0711 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 fda83939beb..35959df0423 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 ef23c3fd382..13a006d1b1c 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 b0a9bedec0c..6614b4b2c50 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 d188eb6fe5f..0fb598582d7 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 a5b051fd1be..b0e8a367c83 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 53becd77042..56a0eda4206 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 7315fa9c238..5efee536adb 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 74fb7319be8..98348750170 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 29b5c4c3ebf..9f2200e526a 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 e757fc13c7f..d29efb63d85 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 bfa11f642ed..b1fc1a4e5ee 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 11739158917..7c87174089a 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 2905f00ca4e..61a63717108 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 d8fd59b7fb3..670fccb6a66 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 5fcfcb5bafc..707e7e4d3ac 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 a42d49d4f9d..52910bf349c 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 f1a405f2fd6..6d9454f65ec 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 26ee8164aeb..24407822788 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 50dd46a4312..cc39929acfd 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 301915940bd..716dad18924 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 add04e382f7..60b975966a4 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 6ee21fae833..615e09c219f 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 9dfeced92f6..0be9f221c7b 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 254e2da813c..37184cb7261 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 bc726c12cef..25cdcf13e0b 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 8fc0231f464..c160b8eeb6e 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 02c12021763..401c58b2a96 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 f95e5ee5345..a5c6a532418 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 1f9b7573cc7..f884fa16c4e 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 56d7f5572be..6aadb7e050e 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 35aa8e603e6..9535cba8972 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 77500fad8a3..db7c3dacef5 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 32717998d72..7c39f44b3a1 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 caab421cd6c..3512df38767 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 0f4c3e28f7c..be898374dc2 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 2e1e088f902..b1239871942 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 0b02985068d..8fb861d2014 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 f4269007159..e2eafa304e5 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 e7ee86b9b5f..96e3582738f 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 c0c9767bc6d..7d618461276 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 f363caaddcb..dd4e220c9f4 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 36e0a8a24b6..927ba0d2836 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 2b6755127dd..9ffcbc58d75 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 082cb409f78..7eeff44f30a 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 cc904abb89e..b3bf473a1b5 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 41709258bd8..4ced1bc07f3 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 52badbb502e..2fa14a1e988 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 331fa7ebaa0..874c5653e63 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 0e05a658d0b..40bc2b85d75 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 95427ec67a9..099bb9c4dfa 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 45525a23060..450c0847a99 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 f7eddd44366..8afa4f321bc 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 cc9d7a7a186..3d61771fc90 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 7d98e05d782..f0c508f511b 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 ac4c1d62c8e..d597691cc69 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 81ea51448fd..c578170a1ef 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 2aed74e4ff8..410746b6adc 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 c37865283da..04bebe6eb81 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 bd83d721abb..0735d42f722 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 3c805a4feb4..0033c96bae0 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 a2f28e34041..629edd69cd4 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 e104778c9d1..a3714c9b1c1 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 2945c194827..9a92c0114c1 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 5c01a85cad7..46f7bd3df7b 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 703120d7d23..43e8f4886c6 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 d6d3c1a063b..dfd267a6906 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 66873d0cc1e..0d82e7971ba 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 8740d2398e8..48492d5fc6e 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 66873d0cc1e..0d82e7971ba 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 80ecf1a81a2..6c0f0cf935d 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 52ef13c794f..73d380047bc 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 72349659ad1..e6a940c18e1 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 359b379f403..84d3f62a989 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 60feb64f5cf..e4fda55c344 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 0bde0143747..4c9db90cab1 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 12722fff645..8f8a67e2f13 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 f54689afd6b..ba04359ad8f 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 d78c2205e96..fdc5b7d7524 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 bd3ac0e5ddb..f0adfd96ab8 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 3c46c2decce..9906c9b413e 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 b9a906281f1..9a0a85f08a0 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 179df30d73f..a8e0e4df494 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 511f978280c..04de1083bb9 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 ca1b7f9e43c..715c1cb002c 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 3daba33b721..21d13be68b7 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 e2abb658551..9ac0001255f 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 003ff8aec8b..008acab85b1 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 53c79c63800..201d1f1bbb0 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 89e3bc4a583..a95f5b3aaee 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 1eb9fa5095e..b4fd53dd118 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 190c107e40d..87143e11a83 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 0603d9d9185..61f7fc13b94 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 b17bdff8835..b8f407f7c99 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 09246c79b3b..8bb1b6b6ed7 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 e66d43d6408..392b8b07cb3 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 726eaa4310f..c4e0ee2a6ba 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 33183229964..9192c183c6a 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 73305d5e31d..8172bbba6d8 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 a02f9922de3..06e9f43da65 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 80603221078..f005fd83247 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 3d16d130c78..be780e37824 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 293f3ec954a..7cba6883426 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 51d579bdeac..e4decf40370 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 f4da0f8eaff..2111957ec45 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 dff4093b693..8c0eb98fe74 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 20d33388712..f430f0d8c94 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 f85362035f4..6ba85c03995 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 58f4f6a2792..18943f43942 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 d745100d924..3da61d35dd9 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 38bf3cb8a14..46fb2b5e250 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 4b475d3d119..ad9604e6962 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 5cc06c5801b..7390939cb9c 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 1ca2cee1e59..8f8fc58f374 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 c05604cedb6..19cb21ad6fb 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 51519238d58..9108e2d2ff8 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 568bf9112f0..ad5469f3197 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 b7684cca594..7f59a852413 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 d49eb328a03..22491297f6c 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 c3794693e6a..666bb774e0e 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 65097863054..10eda815814 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 0b6bc7e1a89..b30f16c8e93 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 c727ca633b7..289c3c67b1e 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 5b9e5535b86..3773cf14eaa 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 61c856bf6d5..84f77e541d1 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 41abbf8a9ca..99d2d6fa8c5 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 c679123de18..1820b8a68ad 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 fe9d7b98787..50cec6fba0d 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 b6e0cb08e52..6484eacb225 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 ba3a1c3ddac..0e2ce77c9cf 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 a1dc84ac5e7..67eead4dd7e 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 1bed89ebff4..c72f068aa3b 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 19d64a9f330..49d7952c449 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 32645e1096e..b1694834a06 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 b47dab35208..aa478151de4 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 39450187d3a..e98be7d3a3d 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 54f429f9bab..64fcbd53c8f 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 9a1cd69a146..af30729e86d 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 a4a1cf5ac29..fca4aeaf965 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 848c04ae7d4..341b56c752e 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 bc333f4d826..f8c5381fe7e 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 19d64a9f330..49d7952c449 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 32645e1096e..b1694834a06 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 f6a1a191e31..9af5c834327 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 50806757c16..02ee4647e1e 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 b47dab35208..aa478151de4 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 f6a1a191e31..9af5c834327 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 50806757c16..02ee4647e1e 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 fdf352249ab..105da24de57 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 44bc8345d47..e5f497942b4 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 0704baa0942..5b05d6d4e13 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 ba98b435eda..ac8f9b8ab16 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 fdf352249ab..105da24de57 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 44bc8345d47..e5f497942b4 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 0704baa0942..5b05d6d4e13 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 ba98b435eda..ac8f9b8ab16 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 0fe929ba298..c84b39b4c04 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 66771534bbf..342cba49595 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 66771534bbf..342cba49595 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 974b7612796..6c5b020908e 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 bc4e199faab..d0ef616318a 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 5bcbed0e485..183ae726344 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 85465012791..d8196a4833b 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 db4147bd1c8..70af5ce632e 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 8e0ab97480f..04157008cf0 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 ff13d462fcb..45f7087644e 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 82f51a84e38..f259b87a536 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 439c4d69e75..bd804b4979a 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 95a0af6323c..6afa00d10ac 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 f8c386598a1..5a2fd18f018 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 59babb0d003..02b60eb6109 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 8dc2044d660..ce3d6ff347f 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 9c612259735..209f79dec07 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 3786ee9a0b9..3094c60140d 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 a8d638121b1..f686170ec94 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 a8d638121b1..f686170ec94 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 ded635795b0..68fcffc2933 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 387f9a53415..eae6e14fec8 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 387f9a53415..eae6e14fec8 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 ccf64e4032c..2085bb67bb9 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 04401520b75..bda6afb8582 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 e7c82c97dd4..6e861ccdba9 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 27b73d013a7..46cf72e121e 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 a3a1fdd737d..5e4ecc9a8f2 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 c7d22c50484..075e9885ae5 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 ab34cec12cd..643d3f353f5 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 0767abddb68..30e18d156da 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 abedc486991..23a30d39841 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 d9cb5840438..400b42b046f 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 6a45d50a2de..b51fe8eb9ed 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 5aa88444449..154a2f2febc 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 00660e0ce81..23b32286130 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 e4faa3f4b8a..7badacb7d7c 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 4863ffe3c7f..aa7e06c788f 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 3d53f01db75..56d9fcd595a 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 56b0bbc3621..4181c44e2b4 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 56b0bbc3621..4181c44e2b4 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 61848c3213d..71e16953af7 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 baedda4175b..88a36eb4a65 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 fc06f829e3d..a8a94be5e3d 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 79686237ed5..01b8a64dc6a 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 3e7e14e5f24..60008abe513 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 b289be432d5..5deb61df968 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 3193c9dafb2..498bced5358 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 ed30e4a2fe6..7921fa3b058 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 95fddf846d2..2f052b530c1 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 8b520fb687e..73c29624294 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 298f1326b81..6202f5ac8c0 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 93a4b39b6b2..c676d8165b6 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 caeab91f302..8518214db90 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 0731911d36c..683ff655953 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 3828d08b6cb..9df90db97c0 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 4db7bf985f5..fe7206a1882 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 c42f171e2a4..5858ee2cbcb 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 d65ac48c3d3..fed261abfe5 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 5f9d2682061..023457e37c3 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 20a14ed8d86..db1a89d9f7e 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 1aeb1df1af9..869ebbe6cab 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 6174b6b3692..8330bb4a735 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 d1f3460aa54..a4027a6ae37 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 b6ccff13af4..663409d4b75 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 997b228d01f..08ff37be4fc 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 2aef5b290ac..bd8103e8bb7 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 ba697cfbe19..86628aaaa36 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 ff13bd8ae47..0dc20165c49 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 6a6dce0fc4f..c75557083dc 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 6de5a28274d..71a53b9c38a 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 9b81c3f7ae7..544e8c79578 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 a34a3b953b3..b0c76156235 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 d6cddaa22d7..6c96dae439a 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 e9e9eb24a35..94c65e0976f 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 c2670fdea65..ce2ea33bc40 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 7fef8ad098d..4d01c4121ce 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 00b793420dd..9e3dd65ac39 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 d9b943c5feb..7e28201f698 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 724668c1a32..ee97515fc15 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 d6db196244d..e593608f0c3 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 042d2df9628..7c4717db941 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 70776809f0d..ca7e2a3aad7 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 ff4a81b0c2c..e44a2a9f43e 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 509818d68f1..1051dd49935 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 2f84e0b9da2..0c7d5207e81 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 00f92337a22..08ce89a63ce 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 5706c65adb3..996c0eccb9a 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 ccc0d6bbc54..cbf7ef02eaa 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 883602bb065..2722233afd8 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 1f2a4139f5f..ddcc55ff775 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 3a0b0f74bec..3ebce603067 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 f44ec41223e..c8043837467 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 cc83a122dbd..f13a99d94fa 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 a88fc01bc67..d552ddf89a1 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 42f44f0665b..04099824075 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 d59dcfce3b1..c5bf8038f1a 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 ccf91b372e2..ff3396d972e 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 bb4187f4fc3..5823a3623c5 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 dae4c34371d..ff8cc6c2e94 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 2c4a9de2196..930e0f9f0ec 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 b146a3cc7d4..4ffe4ce424c 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 7c1ee96dd90..1594f3e6b06 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 6fba5f224a7..aa7f05cce99 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 f7eeeeced31..bdb42cabfb3 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 0a5bcd2ca86..e67874c4b58 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 a86545c6db7..be07791aae6 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 05e7b5be8cf..9f7d3224fcb 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 c1a1fab14e8..a01c5e50f6a 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 3803ddd20ef..53b568f69eb 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 15cb02efbe6..df5cff86b42 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 4be4a898489..45445d42031 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 25d21319ecc..5a1533f3c2c 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 325883b31b6..e2bc530ef5e 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 ee9b9f27a4d..90672c4ee7e 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 6621e650391..a381ee7d22a 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 e26e89fb789..b676e25a9cd 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 e955a33b833..2bc8a08317c 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 704d624b77a..964621bd367 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 3a5561888e8..c08b73b7d60 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 ba338886c76..e8fad7da832 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 b7fca561cf4..509d0465e90 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 456491623e4..24be38be7e3 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 330ce7ca194..70007fb87d4 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 69c39650b80..506c495cd77 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 7b8012a8e3b..75401b476d8 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 d6c928b98f9..83142b44bde 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 7583ffd0a03..9be1396cf49 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 3588b841405..875f63ca9db 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 58144d052d7..a9649ea357c 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 bb4ee16e509..158449e9bf1 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 6649821e024..5d362c1a2dd 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 df46c1ad859..b4e4f63276d 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 bdf1108fac9..a99bfe86b88 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 e97cbfb0cde..e4b6f8d45e3 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 3c230955bbc..59bbaef4d3f 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 7e29333db49..ba30c61e0b9 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 5727c058015..42d3a9621c0 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 4c2376251f1..03a4a762efd 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 4cea0b5dc2a..f967551a9d4 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 513cd54a432..96c4ca79720 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 b521b934d2f..8165fe1489c 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 e69eb1a8bef..377632e2a39 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 dd368dedce2..5e6c84c5b9d 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 552808d6584..12bc9f2593b 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 8fd49bbfd56..1aa31953b36 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 62c815f0d98..c4efab2f81b 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 26e1c37488c..893f6978467 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 5596934e897..7a70c137575 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 3786ee9a0b9..3094c60140d 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 ded635795b0..68fcffc2933 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 ccf64e4032c..2085bb67bb9 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 04401520b75..bda6afb8582 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 869a8ffa298..945df72e205 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 b074e11a7d5..4fc5fd63ec9 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 f262ec6ca17..68ef5e2fa37 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 058ca3f5742..6345dffd113 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 c92ffc083bc..33c7212295e 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 aeff426d5e1..f3d37f44654 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 0f500171572..5ab40ef0761 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 219e119d5a8..f0f75f7b225 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 440af1d3492..964ecf3839b 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 c6872bc5a8e..1863a227ab7 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 86c624b1321..9284c7ae11b 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 833c3a24064..e64488fa0a5 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 6c94671c371..c21fe037708 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 408fa12b03a..ff471905093 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 2bf1dd1daa7..d540964cb10 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 9fcb55cec15..ed86e437b56 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 0177c202045..11689a42bc3 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 bd5121e711c..52380fa946e 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 ac4cc7ab133..4c58a4e5d1e 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 9d9614286eb..5ff0490b1df 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 2efd3058852..cb22eab1cef 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 11904a21601..d39ef4651b9 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 ddc41a8215f..f6d6c663652 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 4d67a35a54d..d8351f09f73 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 a4ecb35da19..9eb7d313828 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 e5498b40b5f..8cebfb004c0 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 75f41e87c72..214d6f96b80 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 b2fa6758fef..95b0081ca32 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 9c0dba09331..f90df10e14d 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 f1c6f5e4d74..ae4958dbf26 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 c98eb4bf96a..21c90d4a7dd 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 7d816b8c807..d70628a9e70 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 cb0e531221d..055bdc2f9d2 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 6bcb5c7b29c..545d66ccf3f 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 6c4d51a1dfa..f3cfa84fdcb 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 5587d188931..8320eaec69f 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 6d60a78196f..e82f49f2385 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 50b9c06a707..a744dc86651 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 08f45404582..bf2880798eb 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 956c6a7c8d6..56312b4002a 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 3ca268d081f..9075b4ec6e5 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 2d70d7ee339..56d196a62fe 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 5da5fa3eac3..30221747ddd 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 ea009b7d381..f975c26e247 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 fed87304e18..250999be814 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 e0893e702f1..d5b729a1847 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 3ddf434c657..25b55fd798b 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 a11260ec5c2..f98fcf27aad 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 62bd99cea7c..4160f0ca2e9 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 e19be8c3a91..0d8c97006a7 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 243c87fa63c..7d854e3bfb7 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 5279f113e8b..14204b18e08 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 11b5530f68e..f589ecfee36 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 4b9ff52fba3..b1582293d82 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 1bd7d11adb1..e007d3e8e42 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 073eab558d8..436caebf84a 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 3a61ae7675a..faecb9771ff 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 b16f6e4f913..a3a4db2be57 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 a9e39f13fdc..5ec3eadead2 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 d04dc6919e2..e9ce3b15a23 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 e4de7e6956d..9a79c263529 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 4ead87013a3..e5149aef95b 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 34b19d46749..4186f4be232 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 416486c039b..29d709bb328 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 4697a7fe236..711bf92e7ea 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 7a8c247fe2a..96207441605 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 cb7aa5fbd19..05210652599 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 aee546f554b..4038967091a 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 f03aeff3670..b0eaa90fce6 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 fe8946bdabd..f649e93a044 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 06e5246552e..b08943569a5 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 e0ebef8b2dd..7ed0a82f58f 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 59c105c325c..d97305c1c55 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 c260de4f862..40289f76a55 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 2f2632ed3fc..1107992f467 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 c89cde1856d..9f96b9dfe17 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 3e118811b5b..d520c2b3570 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 0e7bf1afd7a..75636865588 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 0d204bfe2f0..78b55b6135e 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 29f82055c98..39d50c4c923 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 ba883f7fecc..6d56ab42712 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 ba883f7fecc..6d56ab42712 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 260f5ef0c5d..04d0db82c41 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 689b6abecf2..64d9ba11c50 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 685d724fb5c..f8e134851ab 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 2979c0da944..960acca5a51 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 ebedfaa2e8c..bc03f644640 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 4a44c8519bc..052fa922590 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 db4b80b1a7b..59c70791616 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 103154be7a8..d6cfe80da68 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 24da9644a17..2d2c660847a 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 200dc59931f..6d2ed39e465 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 16c40e26e56..8a1cdaa8703 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 433182d32a0..cf9585b77a5 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 8d8dc6775b8..cc5f328de29 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 114c5ecbf05..c8333d50c8d 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 16c40e26e56..8a1cdaa8703 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 1187657b58e..d01e34c5d6b 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 3c62ec9e4d1..eebeb23182d 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 51e1746f5f9..093e564bef1 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 56408dc78ce..645e4fd3c35 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 8fcaaa4ebae..cb6202f57fa 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 57f19a56b2e..01d82a069fd 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 cd6f42b3358..7e514072071 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 c83deefacdd..5195324852b 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 09b198230eb..36bbaddff5a 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 51bc01498ad..8d4ae4dd1ea 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 e2ee31f7e4c..e46ac964014 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 b7cdc5d3c4c..6830e10690c 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 5d0d89570d7..5efe056267f 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 5d0d89570d7..5efe056267f 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 ed43ff1f54e..f0295e6a6d0 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 02a927e4e30..3cb709c6b46 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 5788c21c387..143cbea66fc 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 f584af830fb..7149ee862af 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 0fc1e1ed885..2fbf557440e 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 03528a92b95..8f39f7da9f1 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 c8166541c08..5745e2bcf46 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 1baa60b6f17..22b62d6040c 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 448dad2052c..5fa77868f86 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 d49eb3ac100..6cf3f0a2398 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 a7c43d3989a..cecd3f6c02d 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 5eaa697948c..27b2d96eef7 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 31293bcaa98..4d33c24028f 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 8bc13207c13..c7bf3dbad93 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 27f6f8be030..e13d7249dd8 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 5cff5fee242..48ec43bc2ae 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 aa542756905..b1be512e34c 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 f788752a353..2b7eae6a605 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 a701ae3c05d..534976624cb 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 b6e15baf913..2e52f6c4e51 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 38efa3122d5..572f317d03d 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 fee35550fa3..45b8bde65f1 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 f844010742a..a37c9e82d69 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 af68ae56aab..8254f873620 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 2f91c23b250..cae329a5761 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 e1e4ae6d1cf..fef8e48fc39 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 62cd9ebd4d9..a67cff8f4e6 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 f002933a9bd..ef5f5ae709c 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 0a92e809246..73e56d7295b 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 75c963ea468..d4173273f52 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 2c37caf8477..2a68f775e67 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 4d67a35a54d..d8351f09f73 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 a4ecb35da19..9eb7d313828 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 cf3fadc5d88..b8d7f3efebb 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 e787f83a98c..e5fcd9ab32b 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 97132204831..b9aabbc7e2b 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 ea22187acb7..d7093fe3fd7 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 46e54466fb9..0409efe2d81 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 c4ad1d7b19a..b4f97a98e11 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 cacee390d07..5008abf2a0a 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 21d4b9bbc34..2a11dc2f636 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 59421d07a57..0ed30ed79da 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 86cd115b663..ee2528b2d8c 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 5d211555e76..6a685d2465e 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 2b256d51eca..0c06e98825c 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 ee4573d5102..75d29acc22e 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 db2ec539b00..5a25bc67f15 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 22a5963acd2..ea16d154b4f 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 e896ff0813b..6620f4f0c32 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 33b372f49b1..cc0fd957f81 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 63ee9f9772f..23425b5a13d 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 e4739114c2c..11f2e80b12b 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 e62c04d3db1..8661a07ebfa 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 57bc67ed002..2c2577ce57e 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 cde967f04c9..520702ba48d 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 11922adfe02..c6276f3e710 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 f64123321f3..aaf805c54ad 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 fe27bfda19c..71c8a3de381 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 9853c7e834b..f27357498d4 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 6fdd15c60fa..392a73f0711 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 fda83939beb..35959df0423 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 ef23c3fd382..13a006d1b1c 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 b0a9bedec0c..6614b4b2c50 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 d188eb6fe5f..0fb598582d7 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 4e3853ce54c..f9acbd04358 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 bbba54dcfdd..463e5283691 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 758f3b5abbe..157454c502e 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 bc0cb5b48b7..17a38d5be9d 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 ec186d0dacc..e6302075286 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 f7e47e1284f..4a8199a672b 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 11b93371a53..666c0f8f41b 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 bc00a758de5..88b9eefb859 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 ba2ef8c65da..49eac87a207 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 796fe78131c..3225b78b893 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 74b05e2cf78..9f20cbae419 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 2c792ebf89b..8c43f93c0ad 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 3c6f9d9179f..d864ddb5cea 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 1ec29db1d9c..fae00277466 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 d2ad431d7f4..95e8e898ad3 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 adb5b5a0ebb..92f00846514 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 3c0a033e8d3..2407e2e8a72 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 31a2a675606..6bd6551341f 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 657c97159d0..7aa65288a00 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 953b4169d1f..412047be2ca 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 a79d3e239a2..bdec08cc3e7 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 e7955452790..50ee7ac1735 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 1b9c3dcd48a..16132a90f91 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 0b6f6a202b2..a6133855280 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 46b45de3d1a..b3e75b334d8 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 ca5f45cd463..f0b9a8a1df4 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 44877bd2e5d..183d5dcd03c 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 015684c9031..d7f5f5d26a1 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 fff9add0a32..578f8bf62df 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 1e6d322c719..0a1f7918e38 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 7d46a11cd4a..f796d18c670 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 603f418fb1c..1504fc84ac0 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 4ead5bd50c9..f6ac5a0f749 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 638b9edfa69..c9019210da5 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 d60826e6a16..6e781455d75 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 633bf776e10..d447664171f 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 ad96332d451..f158eadffd0 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 5f1b6cc7229..f816b321b43 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 f813070e699..07c6da215a5 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 21724e5c294..4f4d84bf02a 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 02509e006d7..ce990e98374 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 14c3fd39c04..b3331e5a726 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 47a0ce17c7e..83d73ab320d 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 5fe9ef6794d..35ee564e074 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 8bfde33b640..273010b3295 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 d215d44a33c..0edb9ad6063 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 07bcd106193..5f00aafd072 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 2c8cb697ad6..b3ebd1f1983 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 cf313e86385..01e8ae9e014 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 8f85c548b03..cb2a45f6a3d 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 2c22020e4fc..0478e386d51 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 9040c5bf4b4..2eb893415ee 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 ca1835e5cd8..1afc40017da 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 0c6ca341824..09963cbe2b6 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 4974f03c110..ed316a944cb 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 3acc700a64f..658a4ceee18 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 ae47731b921..0b73ccbb39d 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 6a4aa226203..1fc5f996cab 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 5ced12f6e32..6334810ae62 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 db4d4d3b14e..a02fb9a71f8 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 25d2dfd2bf8..145f8ca6f0a 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 e4faa3f4b8a..7badacb7d7c 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 9a477c51fb4..cf564071491 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 c2dd63e5b7f..0a7c7d58319 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 70652b58f9b..44974548e70 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 77fe7b3983b..78fbc0adaff 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 9a477c51fb4..cf564071491 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 70652b58f9b..44974548e70 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 77fe7b3983b..78fbc0adaff 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 9ab4345b876..5c7aca44cc8 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 602250020ef..944a93f3b19 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 f16b6a0b7e7..7ee9136bc15 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 88316f88e98..50e7d602eb6 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 c2183ba75d9..e8fa93f4440 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 c72784b5cf7..ab505e906dc 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 26bb61df769..71b759f1e57 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 8571c8bbda6..0dd2f7e49b2 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 35eb84bc507..049b0139171 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 0e186536087..cd91e80da62 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 6e87579e39f..fc36478eedb 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 dc3efe28e4a..aff0a0d9114 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 9d9ce227fb0..b1d913facd2 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 ccaf6847526..4ae998b2d3f 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 50eec3e9ada..2cfbba50614 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 f57a427f5ed..302be7b655a 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 c7902e5c50e..e5a651574e4 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 c7379bf8923..4f937fb82dc 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 318dc1682ec..505588d38bd 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 a4684c9547f..19a550165f9 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 e8089d0a531..2c6f12e2a2f 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 8bcbe93f807..efc478f59d9 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 541f2137d68..7dbbddfccd5 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 e989225cb12..172bcc67dd6 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 b873fca5deb..df08bcd97a1 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 abc0d224ee0..a23a7a5b150 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 2c63cfa3c07..6c22cd7f48d 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 adac83252a3..fe73048da9a 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 bb569b894b3..5a2bcb81269 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 e82da30b19f..1b9cf2bce8c 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 f1a24f3002f..40d6a1d83ce 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 de20c51995c..a01422f31b6 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 0e963a34950..fb7080966fe 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 9061c908ccc..8a7c234b0a9 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 6133286b060..4ce893cbd74 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 df8baa49057..e24c4afce71 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 cf82a12974b..4d15641598e 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 98830e111bf..38f6b93aebb 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 b50199d064a..e64219fd941 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 f79329e0e17..dac6389796a 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 3e7e14e5f24..60008abe513 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 b289be432d5..5deb61df968 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 3193c9dafb2..498bced5358 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 ed30e4a2fe6..7921fa3b058 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 95fddf846d2..2f052b530c1 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 8b520fb687e..73c29624294 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 28362ba9dc7..c173c4fb1d7 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 eb5ed62af63..a31a36c89cd 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 eb5ed62af63..a31a36c89cd 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 dc8ad32a5f6..3b0adfcc13a 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 520458a2126..5050c035109 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 e4feaf98de9..3139674e074 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 345c9538362..3d7c09da596 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 5f8b79d7b9d..73d090a404b 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 732e4787e35..7edcdeec060 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 da01acab109..f14c7f55104 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 b90bbcebf15..6f4bcc39e52 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 bc80b2f3a94..30fc7643242 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 394f86e82b9..a83c9fdd5c1 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 e107b471f35..d5c41320175 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 e199b5f6ed6..1b25853b4e7 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 8cd825698b1..62fdde42681 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 b9c40588c46..f70516002c1 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 7856d586a58..41d7e9769a3 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 11d63f08272..8473d005300 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 3d27c5fe5f2..90fac5589d5 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 4726f1ec1a1..289a732cc3c 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 83ffd1442b2..ac59b24311e 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 b59e851fd87..1278a287cdc 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 e6898174662..2190a35b5f2 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 b89813f6668..bee6b87d06f 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 4604c087793..c0973b33eef 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 d9555852e7f..5668abcf0e5 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 2b8486d8aae..a68e776e456 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 26c0d0bf04a..88a25c73a3f 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 3a112073c67..23f6d9ba92a 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 635781e8182..0eb6d19203b 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 c1bd0970066..f72fa1dc7c1 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 d1a6fb68412..7f564917423 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 1b2205fbd5f..07f727d8e7e 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 6c9fbd42fec..99a8849b190 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 5d9cd1d3613..1b72f4749c0 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 f990a33a3fb..3f93ab82a85 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 81a7c06af6d..d3983d3c678 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 f461d229aab..1aea5ded055 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 1d52a1b419b..84d04b25d00 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 5033235ae74..d64f63b7748 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 f2c38b4269d..f4c397d3cac 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 f9cc403977e..f3ec5571819 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 0a692e3cfbe..26ae12090e0 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 e978510b9b7..b045a235ece 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 61a82419b10..394c1f797d7 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 425066e91d8..5ad06ce018b 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 f0dcfd244a7..65453b05e51 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 f9d2f9be9a0..04a25af8d90 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 3d691b7cbc0..0d914230c3b 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 a9a5f35aabb..4f93f2cc026 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 ee013c05320..85b64942897 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 c1dc06009da..1c37ac40cae 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 adf721c3ec1..accc948c6b4 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 2d50c65a58e..84d3d97103e 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 094d47fda4e..2717ec53cc0 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 061b6959ecf..474788b2c88 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 f889546e112..2011cfea73e 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 80ecf1a81a2..6c0f0cf935d 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 66873d0cc1e..0d82e7971ba 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 80ecf1a81a2..6c0f0cf935d 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 3f57f717949..7dfbfab7563 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 ed921de75a0..0e3045546c9 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 72349659ad1..e6a940c18e1 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 60feb64f5cf..e4fda55c344 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 bd3ac0e5ddb..f0adfd96ab8 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 b6ccff13af4..663409d4b75 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 4b475d3d119..ad9604e6962 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 a1dc84ac5e7..67eead4dd7e 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 1bed89ebff4..c72f068aa3b 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 39450187d3a..e98be7d3a3d 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 d9cb5840438..400b42b046f 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 caeab91f302..8518214db90 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 0731911d36c..683ff655953 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 1aeb1df1af9..869ebbe6cab 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 6174b6b3692..8330bb4a735 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 c98eb4bf96a..21c90d4a7dd 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 6a7bcf059a1..f484971eab2 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 d7a5c495d6d..c19ba9e027b 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 4c5dbd34bb5..f678609719d 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 baf20187da6..5fc0a429673 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 3d95a6278dd..8ecee477fa5 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 bebec68ceca..c16333ced11 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 b3b30b13f3f..16e8106d5e7 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 0ad6dfbfd56..cb7f228d671 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 6a361a0052f..074b4e639bc 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 2814f066e0f..51a2e77541f 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 dce98e87e5b..f19622475bb 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 9f17b0c7d61..2df51826821 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 574220aade8..8a46b522cc7 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 d971aa95f02..33342b92227 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 ba53f4eab87..0f1e86d6773 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 e9244fbe206..481a390393e 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 a58caadce1b..a56bb36d91a 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 b28691bacde..1045b28c9f7 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 0c28185a347..22e98eda710 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 95b55613bf4..f2627266353 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 dfde63760a8..a3c33bfc293 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 b996e5d78be..6e189b4a559 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 7f93e4b6f6f..ec7e216d0b4 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 c835a6ee2cc..ab31e7095ea 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 969cd089249..283ed1701a3 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 8ae685485f4..ef591aa7b51 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 962bafcc779..d21354e3c79 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 fe8281dc50f..bb1a4bf2a86 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 969cd089249..283ed1701a3 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 0c28185a347..22e98eda710 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 b8bd5958c13..60775d1329d 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 791060a03f8..6129ed86f48 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 b0f8e3cda6e..6d48081e4d0 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 4442500ef80..9abc3b74660 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 7093dbb86df..ae99af947ab 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 fb6c1ff9368..ee277419c36 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 943d8ae860c..0641f665797 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 76b45ff8c32..0f5930ca7a0 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 e717563e7ed..5e3ed49ee48 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 188e20bc0f4..8a3e1c93030 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 2a0f13624b2..09e31cb980b 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 43d8cff9dfd..b50b6f18d57 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 b81116f06df..77814817649 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 21bc706129c..b907f27c034 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 99d779e07ad..f90560ee821 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 c4868fcfdac..a0eecd97ba9 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 436489263ca..5cc637a92cd 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 d2ebfa85f17..2acf3d2bbd6 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 664920bfa31..bee650f7665 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 89841418052..bc268b6ac8e 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 aff36c81c30..cea6b15ddd4 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 8b7429b1edc..6c36cf85540 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 cabb184b33c..3578b3a07e5 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 d04fce1bc45..6bd86ced28f 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 7770896ed3d..fa111fa88f5 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 a9a25fd666f..bed71d6fb9f 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 89506bfced4..67af2fcfdd5 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 3c70d005885..5c0b316dacd 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 ebdaa97f63b..f000929cc5b 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 d8806bf1c45..883374875c5 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 90e30ff70cd..b9a3e554ead 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 ed3388c4760..ccbdf1f86ba 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 d8efc1ec885..61182e6a34f 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 4b4af8b76ef..18469ec7834 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 fe6041b4c4b..0d258ff9d94 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 9d7494e0fc1..22059f1d072 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 55e44e0bec2..38c70709e7c 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 55e44e0bec2..38c70709e7c 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 5f7cf5b6ef0..754965ef388 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 03355374e93..9111b5cb0f0 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 f1023173b3d..7ac12436602 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 00bdf7affe4..92b9e1a5d70 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 89218abb317..ee2076807da 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 e9f9403f619..b3fd514cbc9 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 928aa2b70de..b8d1af3b2c5 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 28e80ba2b89..b6a9795a5ae 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 28e80ba2b89..b6a9795a5ae 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 28e80ba2b89..b6a9795a5ae 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 ee58d5a24ef..3533a671fe8 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 28e80ba2b89..b6a9795a5ae 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 4eb051e1819..8742dd195e0 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 f49aa32cf16..8080f2b469f 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 03e2d79e20f..f5c654a6a64 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 f332eebcfb1..0b8fc4e0de3 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 d3e4ad47b9f..4a2fe79f41a 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 9c72d0db532..9618b252019 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 ece2509927a..93e01e26287 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 aaa32f66661..d5022d81e92 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 ac0cce3ee0e..756c08c0204 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 63971e5a907..9023c768010 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 7670fd1cee1..c233b09655b 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 a0296ecc8c0..5cdbc97f7d4 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 cd2561f8b9d..c3e674f7f30 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 f339f01c43c..b212d6c7b77 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 c02009b8343..28336d70853 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 6305f86352d..b399b7c27ad 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 3edf3ad1e14..f94df0f9ca1 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 980bb0ae1d3..e2f1ee17f58 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 2f6c7530990..785379f2549 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 97bdb90f684..62d2829b8b8 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 07fcde86df6..0f1004acae3 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 5b9a7307dd1..3001e6466ee 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 ab4d529ea94..3c9c49ddda3 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 f002933a9bd..ef5f5ae709c 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 1626f13862c..63c5a93f7d9 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 6649821e024..5d362c1a2dd 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 acfa10de0f0..f2d9beb1899 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 0767abddb68..30e18d156da 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 5d7a5c57a33..8be709aea31 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 891d8f0a22a..3b4da37da23 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 6207e93529b..28c39aaf94e 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 fe6041b4c4b..0d258ff9d94 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 1b3c0055642..1faff8261b3 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 2d70d7ee339..56d196a62fe 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 491eb46b024..755e1e72cce 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 98cc0ad38a0..12d49a2a5d7 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 988a2e1a69c..a0099364a99 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 969cd089249..283ed1701a3 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 e8347e67754..679de2eed30 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 10384c6ebf9..2e7a31d2508 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 4f0cbc0d557..1a8b1a724b9 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 1ea2f927319..3a317863812 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 9e64a3f1330..cd2d5ff35b7 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 ea221c7954a..b56bddc967d 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 f5ce264fce1..97c4a180d6f 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 bae4564ee00..969f910f7f8 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 5cee924dd9f..ed3044cc4d6 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 36d07e9e8ce..154cf949ba0 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 44556e7731a..34b3fc54aaa 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 c02009b8343..28336d70853 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 6a7ae14e38a..c8f93f4ee52 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 fd55bdcb2ef..b9f3f745a4e 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 ae6cd6337bc..bc2679e385c 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 e034e611e06..1d2b6009f52 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 5f1733587f8..6a7e233a840 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 2c43a2eef8d..55a26fd636a 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 569173a1a6a..e084f8111d1 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 994bdfda036..1f541c7b30d 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 ead0334ee22..ef4b8dbc3e8 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 1a6e20d91af..d043d8b5a11 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 c0337c06ce6..173ea2d92f8 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 416486c039b..29d709bb328 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 51dc1960901..deaa06ca792 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 e0ebef8b2dd..7ed0a82f58f 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 c425db6f7d3..0524d76b6fb 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 a4093eee1c6..dd897284e23 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 0d204bfe2f0..78b55b6135e 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 f6e04fa98cb..d95f9331f62 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 1766283e7f2..341eb87a472 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 a9248389acd..009c7810259 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 96928d18996..6cc059a1e58 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 636133a9a87..2003a66609b 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 c7eec31db1e..39672cd98b0 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 5661462e11f..d1d4ed0c090 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 602ef0748f9..1231bb20a77 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 9ec54e2d34a..0a5847dd5ff 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 868e34774b8..8262a01e093 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 a8c33c194b3..74ed23c6b9d 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 5cc06c5801b..7390939cb9c 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 b6e0cb08e52..6484eacb225 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 e0f946d3d99..fbe2fde5860 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 d9db7971151..921802e7b59 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 57ddeca3009..855de265133 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 6a7bcf059a1..f484971eab2 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 dce5783cfc6..b03cf04b3f2 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 41803004dc3..9fcb9a35390 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 865f82bae6a..72412a93133 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 5bde4b72d15..3e71b3fe18c 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 cbb8b5ea49b..24ce97b666b 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 188e20bc0f4..8a3e1c93030 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 d3bda191237..efd84295f29 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 836239bac68..55503c0a66c 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 56b0bbc3621..4181c44e2b4 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 baedda4175b..88a36eb4a65 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 d6be12a9ddd..342537904b6 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 5d59813afac..11b107f3f79 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 1c39b45a7fc..881b198641c 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 ee9b9f27a4d..90672c4ee7e 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 cc74b0b6772..06b665b708f 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 e26e89fb789..b676e25a9cd 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 84ee90f08e6..988eaa8987d 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 e955a33b833..2bc8a08317c 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 704d624b77a..964621bd367 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 f222f1ad718..239741db9e4 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 b91f5fd2a83..2d93e76a554 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 e760e306cac..6f9376af2f2 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 c651a3014ad..272e56c9e4e 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 cfe4dceb087..14e8d14aa9b 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 147bad070f5..cdbac2bba16 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 0f3a3caeaa3..34753583a41 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 cbb8b5ea49b..24ce97b666b 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 66771534bbf..342cba49595 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 974b7612796..6c5b020908e 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 4863ffe3c7f..aa7e06c788f 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 3d53f01db75..56d9fcd595a 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 d65ac48c3d3..fed261abfe5 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 20a14ed8d86..db1a89d9f7e 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 7945fb0800e..86b796e8bd7 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 8b133b3bd6d..3fb3f15a295 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 d1f3460aa54..a4027a6ae37 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 997b228d01f..08ff37be4fc 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 2aef5b290ac..bd8103e8bb7 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 00b793420dd..9e3dd65ac39 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 d9b943c5feb..7e28201f698 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 d6c928b98f9..83142b44bde 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 7583ffd0a03..9be1396cf49 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 3588b841405..875f63ca9db 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 073259d9113..700cb6dc8f5 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 058ca3f5742..6345dffd113 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 aeff426d5e1..f3d37f44654 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 b7c90a8eeb9..7d8fa3031e8 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 cab679a4bd3..ee56e82e496 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 ba883f7fecc..6d56ab42712 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 689b6abecf2..64d9ba11c50 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 0a92e809246..73e56d7295b 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 75c963ea468..d4173273f52 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 2c37caf8477..2a68f775e67 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 7f59869e2d4..8db782237ca 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 a7059fae30a..3043517939e 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 31720b5f5a3..b9848f7cfec 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 3a214a99522..8bdb4b6d72d 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 06593cf359f..adea3037caa 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 ad7eb1132bb..964834d916f 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 a4756d87dfc..78b1c1d5fef 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 8e153a71c62..f87d9816f07 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 ea25f20604e..cc66da9be04 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 83fd0bcebea..c84d1e22cc2 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 6d763811ae4..e6f57f6c81c 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 022dfc34da4..07cbd8d04c4 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 7855aaa89fa..698c67004a7 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 3fe234c3422..15f8b3d804d 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 a0be302ca31..3ed23fea4b5 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 09e86395df2..ef72e12af63 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 db970a2788e..70906f0073e 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 4705d15c63f..a29d1b9b1e5 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 0f500171572..5ab40ef0761 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 219e119d5a8..f0f75f7b225 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 ddc41a8215f..f6d6c663652 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 3a214a99522..8bdb4b6d72d 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 a99b5674ea4..374c0661701 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 cdf3b358220..62875bf487c 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 e5498b40b5f..8cebfb004c0 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 08cba7f52e0..741baa907f6 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 44556e7731a..34b3fc54aaa 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 94a039c089b..f8147d05e30 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 b91b50d1198..7b6392578d9 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 073eab558d8..436caebf84a 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 3a61ae7675a..faecb9771ff 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 34479056ed7..d934ee56eee 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 4268375a057..c9c450fc4f0 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 b16f6e4f913..a3a4db2be57 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 a9e39f13fdc..5ec3eadead2 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 d04dc6919e2..e9ce3b15a23 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 34b19d46749..4186f4be232 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 4697a7fe236..711bf92e7ea 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 c6afae932d4..8f2f5a547b9 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 c6f11f33fc5..11cbdee0213 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 2340d6079c1..13f37027503 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 29f82055c98..39d50c4c923 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 e7818522d45..4baeeefbc06 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 ff27bacc24a..0bfd7fc8cd6 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 608f13586c3..5447a90126a 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 e4707a175b2..101547102b8 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 74de2820d87..972518391fc 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 865f82bae6a..72412a93133 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 5bde4b72d15..3e71b3fe18c 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 6730c55cfa2..1cf76da0fc2 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 a089527fa1e..f7837d7407b 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 7337796969a..5dae30e4e97 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 36f2e012e77..6cb7a137565 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 67836c50d8a..33f0ee47875 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 d399ad080a3..c062c96ec17 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 3850a4de2fb..6a766ba5d9f 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 93fafa2a371..4e5db53e99c 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 5d5169d9968..c76402c31e6 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 a5b051fd1be..b0e8a367c83 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 99a88a510f6..5d962a6c04d 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 53becd77042..56a0eda4206 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 7315fa9c238..5efee536adb 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 74fb7319be8..98348750170 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 29b5c4c3ebf..9f2200e526a 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 e757fc13c7f..d29efb63d85 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 bfa11f642ed..b1fc1a4e5ee 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 6c626bca01d..871ccfbed4c 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 11739158917..7c87174089a 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 2905f00ca4e..61a63717108 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 d1e1425ed5a..01e25880123 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 369ee6ffd3a..5e6ce0719a2 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 08cba7f52e0..741baa907f6 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 08cba7f52e0..741baa907f6 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 08cba7f52e0..741baa907f6 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 a21c0be0980..41583f5896c 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 065dbdb117b..6c3b0ae8fe4 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 0c77505d58d..611828981ee 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 06b808942c2..f183e60a47a 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 91688154c19..17d90c276f1 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 afd34d7ddad..24c5f273760 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 b2ac7d01fc2..b5944513cc9 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 a2911d8b8d3..e3dcac43c58 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 16d9de450ff..3852b5bbdd2 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 4dd18c19723..5e5c9c2a0ef 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 52832410285..ad02f2b653a 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 3edf3ad1e14..f94df0f9ca1 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 980bb0ae1d3..e2f1ee17f58 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 b13ac0e558d..c5c852d3348 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 2f6c7530990..785379f2549 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 15d06eec5ee..0a85a7081f5 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 5ad09bd9e82..4386b7b3d60 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 4d496120869..6dee953098e 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 3655bb1e5b4..9a09838c419 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 0d63abbbc3a..0604c33e94d 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 97bdb90f684..62d2829b8b8 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 07fcde86df6..0f1004acae3 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 5b9a7307dd1..3001e6466ee 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 5018e085291..59f4211d7dd 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 0d2015673d2..8cb1ec1a5f0 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 b9b3395a093..0b41c7bea12 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 a6f0ad880f3..575da1abd0f 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 8da5e0082d0..a411c8cb132 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 bd9dfd0ae87..24f0aec4c97 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 b5314db2239..a651d6bf7d8 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 75aa9909996..cca3a5b9127 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 1f75302db43..1e586ae002a 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 1924fceea19..2b43323c70d 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 5ad56203d5d..e1792e2e2d3 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 573bb8672a6..1dea51d676d 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 0cc0a01b7b9..3c80e68a6a7 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 4ddf779736d..efa1e7b6f69 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 b611bf9955b..ed4208ac4d4 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 e58c4b8bde0..4c2483e1fee 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 71ec0c3120b..64d20e772f5 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 942b9cc4dad..82fb523ad0a 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 a2361b98665..b1a141ed087 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 ba927c40ddd..c240a80e872 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 f732dd18030..59ef6d77e3b 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 f6ceb5d2dab..bf32211afab 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 0e534eb58ff..e83061a7eb4 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 c46af2b6ca8..9ec4cf3c0e7 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 79774bb313c..847bb4fbb05 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 f013bbbea3d..3bf196f9da8 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 f4134e405bd..142cff3d808 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 09e6f471d46..ed48a66d53e 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 8de92459538..4759762ce76 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 e62d6a16457..3a8424985ff 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 4b6f1b532ca..0d36135ce9e 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 8f4f284af42..7fb53e63929 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 f0315b07182..afbc6a5ff5f 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 d8b8792c739..9c58ee816ba 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 bd6b8c53ba8..c89bb5d2572 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 a90299542c9..a72189b73df 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 0a80fbb2595..709dbcee4f0 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 7e0a6998899..a339c2a289b 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 0ac1918c9dd..a19025c8aaf 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 cb6ff4ce07d..d4e0f8ec6c0 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 d5953f01102..c5426bde0c8 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 3b3686cf4a4..a043d851340 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 f282dd45c5e..cee25ab9bbb 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 af0809f0c65..0b838b0fd29 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 ea046622d5a..051c5b2a064 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 00b82d623fa..ae3f6def3aa 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 7a7db049fdb..50ace65d6ca 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 8c5059e18d7..cdfddee41cb 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 9da6d40e617..21b12bb6eb2 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 59afdf69dfb..309d952e36e 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 b0299186f34..1ca81aa84b5 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 c27cfb8b256..127bb303ce3 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 141bef08e1d..32666672aff 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 36ca34c04f0..f5e3d320e79 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 66a40b6e735..32e6d806b8e 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 a022bf8b866..6bc0e671458 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 a7553d5d3cd..3b46875e8ae 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 a4a01bef7aa..70c916d3a0a 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 46210d66da4..fa6ea162b65 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 6e0256587ed..cc6d9040c58 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 8c7a8a82dfa..376d5ffb91e 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 fc28f9fcbd4..e180b9d2497 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 7e83fce46f3..4e745ea4a73 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 fb2d129a884..19a2fbaa7b0 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 33960856597..60cf4dc3412 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 5d011b41693..0225137d6fe 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 6090f297269..aff1ecaee74 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 02bd758f5be..fefb25d3f2a 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 aba50027556..f6d343f3137 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 d51f16d731a..ec422f0b1df 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 a8d638121b1..f686170ec94 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 387f9a53415..eae6e14fec8 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 188e20bc0f4..8a3e1c93030 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 6a45d50a2de..b51fe8eb9ed 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 c2670fdea65..ce2ea33bc40 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 83e291f9813..c1a4470514a 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 7fef8ad098d..4d01c4121ce 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 6621e650391..a381ee7d22a 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 3a5561888e8..c08b73b7d60 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 ba338886c76..e8fad7da832 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 e1106ca8d26..c16b6632f1a 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 844799243e2..c63f1efac86 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 72daf4a8768..051b0dee11a 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 31323ccfaaa..9bb333fb93c 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 e15f7cd9875..a2162cd4dfc 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 2f63e627d99..2d157aae08b 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 049eb7bc5b8..cc50a1a00b7 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 073eab558d8..436caebf84a 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 3a61ae7675a..faecb9771ff 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 e7c82c97dd4..6e861ccdba9 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 ea187d9e186..6f78657db0e 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 7a8c247fe2a..96207441605 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 cb7aa5fbd19..05210652599 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 499a9026ac0..2f8111dfdcc 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 813458e3531..decd080c42d 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 cf3fadc5d88..b8d7f3efebb 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 e787f83a98c..e5fcd9ab32b 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 97132204831..b9aabbc7e2b 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 ea22187acb7..d7093fe3fd7 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 46e54466fb9..0409efe2d81 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 c4ad1d7b19a..b4f97a98e11 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 cacee390d07..5008abf2a0a 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 21d4b9bbc34..2a11dc2f636 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 59421d07a57..0ed30ed79da 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 86cd115b663..ee2528b2d8c 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 5d211555e76..6a685d2465e 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 2b256d51eca..0c06e98825c 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 869639f074f..d701283a771 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 181c5bfc000..1d6215bf85c 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 df983dec2d2..0b3cbf5fc20 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 59f347c5eac..d58d2741860 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 09e52f17b26..f3c2e6001df 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 4a6e6f7bb21..38bab6bf214 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 1db9b2c9964..f38e0bf0779 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 7791f7f3b9d..7a0e216ac69 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 f76c2e2191b..3222b166823 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 18305494b61..4d7b6a94e46 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 2f865348c8b..58dc63f944c 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 653259694fb..7e718a24f3f 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 df235e46e8d..fb5d71fd075 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 ef105514faf..6bb57e09a17 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 10a54ac73ee..50e29b8ccd4 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 633e7e76bec..c02dadf2f94 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 22565f73cd6..1e46c79059b 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 e90a6897164..16fd0487ecd 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 939888ec578..19e4a6ad931 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 26c1f6bfab2..8feb119b628 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 35f6567dabd..2b2dfeb13c7 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 21f38e2562d..27bb5c49f6a 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 4b3a42a4c58..98098ad6905 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 aa69b24bd5d..91940022e48 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 19dd2be31a6..c4e28a5842f 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 a5a81722d5b..69130d68e99 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 a8e35e173a7..28e1f6d10b0 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 e4ad6f5c580..5c2635046a4 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 4268375a057..c9c450fc4f0 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 811ccf479b5..813a978534d 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 5583a250c0e..5cd4f85135d 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 0b4a89c18ef..49465fce8ba 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 73d7d2c8a09..2b32e3d10c7 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 17d3a6c63da..be058daa54a 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 562ad477b78..3ba15ad4502 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 c6877f60344..af6c32aff39 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 18305494b61..4d7b6a94e46 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 ba5b35d46c5..3531e2c6d36 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 880f9722176..032b0385981 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 c7d44016f1c..45bc266c567 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 92b26cee0ce..5009db2585f 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 e7955ec5d0a..50d1e1c8845 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 e30294e89c4..e481e2cfbbb 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 e30294e89c4..e481e2cfbbb 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 6c6ec306d31..85f6bc5284b 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 0cbd2475f9d..413d2b88f51 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 d6175ee1136..c4e3791f534 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 3e90dc5a503..4de4ee940e4 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 79dc27c22a7..080bec79481 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 27e280e6a30..d03e65685c4 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 b1e5edaa5c3..a7d1daf79e8 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 18c3fcb1efd..448b869c47c 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 a46e11ab7b0..a52efbd9ef5 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 d6be12a9ddd..342537904b6 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 d72940ec0b3..4d154c91300 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 13cf4e5dc1e..d09541814fe 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 2caef177298..997afa7a5a9 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 7272789fc8f..b08a3f8705a 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 7eb635a13bd..15df73bbf1e 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 b9a906281f1..9a0a85f08a0 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 932b6e5fd1b..e8d523e393d 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 bed6aa038ce..ed9c0d8b77e 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 609937eddf3..ed9a633ab76 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 8b1f7404c26..ea3c03df674 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 969cd089249..283ed1701a3 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 e717563e7ed..5e3ed49ee48 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 5339179923e..e0298f71702 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 2a810435539..e187c21dea2 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 06b897f69a9..e4f6d506d9e 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 814db9845c5..8a40fb4eb33 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 123ff936aaf..6ad438328dc 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 dc2ca3c25b9..843cc9d135b 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 116ae31ec40..4a006add5be 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 4d0e3e7b746..badbdc498c0 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 8a27aa93637..534f75431bb 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 637188786fd..533502cc5c0 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 fca46ba7860..ee1b6e76577 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 fa2ae5c002f..c104e223c10 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 12f26e0f8f5..43c73be8ac7 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 397b56b7941..4fef6f65cc3 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 47b7df93f24..a29687c84dd 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 0e7bf1afd7a..75636865588 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 b1e5edaa5c3..a7d1daf79e8 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 8f4c84c6638..39b75c2bf38 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 1109c07382f..1ee95bcaaa9 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 cb6f6efdb74..d4aa88fa8ca 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 92505fb6b8a..fdf341dc6cc 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 7d6e3b64bd5..d114feef1a4 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 14d73c32741..f6115a97186 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 3bda374aba2..0cf3c048d79 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 14d73c32741..f6115a97186 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 5cf6100c53d..05fb328ac9b 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 0d749bc06d8..d1c26136888 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 7d5fd4fa2f0..7caf954a1ca 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 f23db16e163..6b037752d8c 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 ac6082f2626..7c7afa3bd0f 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 f6fc890b3dc..f498b189fc2 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 c2c53f73aa7..87f3e4a7bc9 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 140f2d01f21..f10fcf590d8 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 dc2502dba2b..c677e19c3aa 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 6b6a687112a..ae7aeeb4ad7 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 8ea1226d1e0..afe642c89cf 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 7d31e499f3b..e168ce58c18 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 c2c53f73aa7..87f3e4a7bc9 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 dc2502dba2b..c677e19c3aa 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 6b6a687112a..ae7aeeb4ad7 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 a91ca18672f..0a08938ae24 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 07e0e91781c..9c042dbac7d 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 07e0e91781c..9c042dbac7d 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 b60ff4a8492..bac48ddfdee 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 38b9df95e66..51793da73f7 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 9f92718ea67..d278a361946 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 74fa0fdcdbc..4e8e8d6441b 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 7d22f9d7737..031fcc0523b 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 cf0e525e0f6..7c09ce53941 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 d9c486bfe04..55198b90d89 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 73a21b3256c..b221ce58240 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 74e24502cae..533b8ec483a 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 c9483e7123b..63512232fa2 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 2819cf8e5a0..8477ac24ea8 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 9c9b9213a86..a4510cad9c5 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 0aba85e0081..5d20c1d233c 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 b93de210cec..6cce84eb658 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 7eaf3825e57..ca3c1c4c120 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 d914dc17be6..c0e51b32fb7 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 82515630e8a..f17a2474dbd 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 c4065e218d0..a803bf40e8f 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 f451088c350..0a1e97e9e4e 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 82a363581a1..241adeb7a6c 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 42f5932598a..407ad6b0e67 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 0c9c9dd044c..14f57542f76 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 97b4c8e4273..35ddea1add6 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 bd661fbeb06..f51abccb84d 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 0233e2c81d6..2a68f583f01 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 9348b0e3ece..8ea07da266a 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 707cb145c35..2d9da767828 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 494e21f1084..77c5f66233e 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 93de5b9914e..cf6bd4ff029 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 52e0da1bed1..e3e50cbfca2 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 d089d8920a9..523a456fe4e 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 44ebc0ed4e1..2b36d1a1945 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 cb54477a4d4..9f34e6b4e37 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 2d23081f655..5cce1827ed3 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 153c715c693..0827fbdc826 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 b076b0e232a..30fb30713f3 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 e49190902a2..b666446f049 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 4e3853ce54c..f9acbd04358 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 c7bfb5680c3..0c8e434ce6a 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 f3611f18d5a..dbc2f31a37b 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 5506961ce84..9d6ce133997 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 ece7f7e3bfc..7df378ccade 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 bbba54dcfdd..463e5283691 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 758f3b5abbe..157454c502e 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 bc0cb5b48b7..17a38d5be9d 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 ec186d0dacc..e6302075286 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 f7e47e1284f..4a8199a672b 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 47a80cfc9af..361d4899bea 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 295b647dea1..522f77d0087 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 cf5b8d7bf64..0488709374d 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 7d46a11cd4a..f796d18c670 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 603f418fb1c..1504fc84ac0 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 4ead5bd50c9..f6ac5a0f749 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 638b9edfa69..c9019210da5 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 d60826e6a16..6e781455d75 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 633bf776e10..d447664171f 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 ad96332d451..f158eadffd0 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 5f1b6cc7229..f816b321b43 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 f813070e699..07c6da215a5 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 21724e5c294..4f4d84bf02a 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 02509e006d7..ce990e98374 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 14c3fd39c04..b3331e5a726 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 47a0ce17c7e..83d73ab320d 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 5fe9ef6794d..35ee564e074 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 8bfde33b640..273010b3295 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 d215d44a33c..0edb9ad6063 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 07bcd106193..5f00aafd072 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 2c8cb697ad6..b3ebd1f1983 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 cf313e86385..01e8ae9e014 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 8f85c548b03..cb2a45f6a3d 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 2c22020e4fc..0478e386d51 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 9040c5bf4b4..2eb893415ee 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 ca1835e5cd8..1afc40017da 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 0c6ca341824..09963cbe2b6 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 4974f03c110..ed316a944cb 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 3acc700a64f..658a4ceee18 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 ae47731b921..0b73ccbb39d 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 6a4aa226203..1fc5f996cab 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 5ced12f6e32..6334810ae62 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 db4d4d3b14e..a02fb9a71f8 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 25d2dfd2bf8..145f8ca6f0a 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 db7bdd1b668..2f28cb75968 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 5aa863d3f3b..2e4c96d251b 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 22b5a7e2377..a145312597c 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 0d320364369..49c977f91bf 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 f74deb73799..cb17db2a800 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 93cf3c10dee..223ad52b8ef 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 9c2dd4ba36d..757725ac10e 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 f30ec7b464a..d3ce37ebd1f 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 759158538e9..ab7ecd123ad 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 6052e62e063..4981b5636da 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 6052e62e063..4981b5636da 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 680e3c78bca..66c2ad1ae02 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 607f4597af6..d54f1532b8b 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 2332e4bc11b..d7bfb676aa6 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 9bb8a5b303b..f9e58255f0b 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 3d21cece9d0..be34bd88ba4 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 0fd465fa023..c8bf2a809c8 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 65fc09e7ef1..e5df9a67610 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 14eaf4fd7e5..4f429dfab29 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 96e3964f1ee..5d177c34b71 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 153a41e3939..038ef19a37d 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 f44df9fe03c..39412bcd95a 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 a75c2124f58..963349f8657 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 335833f31b1..a54ef87c389 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 b88217905ee..e073e4731a4 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 3f165a6aa2a..48c5482eb12 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 d1c7500349a..1b29c524424 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 72485f0be1b..0ac294c4c42 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 df0d4973ad0..13f3f0b31f0 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 8545fbbc47b..aad1331a274 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 6fde55f65ac..a5cbc9e4ba7 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 4e3d5d20563..4cb73b08969 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 cc810227734..777aa2a251b 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 cc810227734..777aa2a251b 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 ae4ea4f67c7..cad21d2d87c 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 719adcd2692..113d58922c0 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 719adcd2692..113d58922c0 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 719adcd2692..113d58922c0 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 05beab5ac08..0aea8277177 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 4b1957611a3..3fd3568b868 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 550d58922a4..3cf39746071 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 839832652fd..dc567a6ffda 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 0d35dd9c5c8..f6037ff996f 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 0d35dd9c5c8..f6037ff996f 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 1ff51be5dd8..068c5129956 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 d2de96eb0f6..0e7509634a3 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 3aefa89cd13..da9f5075fc7 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 3d3d48b05bf..1c634bf4bf9 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 64212f6bfa2..265f86d1ed5 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 798e7e42838..af009a28261 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 6de5a28274d..71a53b9c38a 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 baf064c5b97..a64a61864db 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 9b81c3f7ae7..544e8c79578 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 423e2ad353e..d078a43666d 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 8c83443d32b..02984600349 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 94a945b6a01..8d9b050b19d 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 c8a0aee38db..0578721e363 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 ad4d46abbba..078b80d8943 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 6acf6689334..4cb76777fde 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 14c8f2fee17..cbcdc08303a 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 60392e0a0bf..265f86d1ed5 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 4f881865a81..e299c924f7a 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 2979c0da944..960acca5a51 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 4f0e6a3624e..ea340778419 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 ebedfaa2e8c..bc03f644640 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 d5ac4067ecc..5fc34ebfe19 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 4a44c8519bc..052fa922590 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 db4b80b1a7b..59c70791616 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 9d8d1a3115c..f62b1f4a275 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 103154be7a8..d6cfe80da68 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 1bccccdbde1..2a9ede26cce 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 24da9644a17..2d2c660847a 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 8b964f34a0f..ecc5ec33258 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 200dc59931f..6d2ed39e465 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 88a7bfc9872..6dab3edc9ac 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 51e1746f5f9..093e564bef1 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 02a8456e8dc..7ae11d78285 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 56408dc78ce..645e4fd3c35 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 3902ca0eac5..45a3af9ecb2 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 cd6f42b3358..7e514072071 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 9fd0b6b0fc3..6f4844d7c6b 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 250e268bb0a..e1f03399e4e 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 6a1332c1272..28acc62ee64 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 defca0bcc7d..ff0ab8a3253 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 defca0bcc7d..ff0ab8a3253 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 ab9be45aa61..f38483fb54c 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 f8cb0bbcf23..b717bbc2b7f 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 2f7407b470f..929969d0cba 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 468419ae9d6..cd9257dd663 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 862449c7786..0b8f4de8b80 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 544cc481494..6a5b533c1fc 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 11b93371a53..666c0f8f41b 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 bc00a758de5..88b9eefb859 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 ba2ef8c65da..49eac87a207 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 796fe78131c..3225b78b893 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 74b05e2cf78..9f20cbae419 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 2c792ebf89b..8c43f93c0ad 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 3c6f9d9179f..d864ddb5cea 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 1ec29db1d9c..fae00277466 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 d2ad431d7f4..95e8e898ad3 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 adb5b5a0ebb..92f00846514 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 3c0a033e8d3..2407e2e8a72 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 31a2a675606..6bd6551341f 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 511ec3e3a06..0e73b83c6df 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 cc3ed962e7b..fa5e46cc484 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 c09d54c09a7..0936b849031 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 ab2b088e8cc..bff916348c5 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 39ac4897915..d87cc40b2f9 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 fde1f92833d..d5072cc11b7 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 c9c03a7c924..c8b62e0c572 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 336ff4768cd..fc6acc6c9c8 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 74b3916ae5d..0a1d4c00d91 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 1e128034926..6ffb9ace5e3 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 1887c91a9c7..b5faac71040 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 23f6dfcd3ca..8ceea66b9fc 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 e33abaec7e5..97902a75b94 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 c0375a735a6..a1981f74ace 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 19a573c8bb9..aac7c1439dc 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 ce72cbd72b1..489bcb2c336 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 dbc4be8e923..c4d65ec4edf 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 8df7aa3e027..495362b5c13 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 3cdf6521679..8bcd63e5646 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 47663e829d0..e1607903f3d 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 50369dac6f5..128b9246975 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 e363485fa2c..a097ce71a30 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 b07927359f3..a4489ca01e4 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 94abc47ca66..6c29389f687 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 4e666b385cc..f781204da1e 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 d49a5dffc16..713d39a22a3 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 c764daf7772..e4b4fd7cfcc 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 cce2fa60b1f..74aad170abe 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 db88bfdcd06..06ac4d96152 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 6c88766fcfd..5d47287a4f1 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 380f58877b7..1f079908cc6 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 1a1fa646195..999372bb920 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 8a0e9b55d24..2e9703f4796 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 833ba471c37..ebcbcbfef19 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 8163f60e2fc..a598d193973 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 3e23fda037c..dac28c8e520 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 7498cbfeccc..a9679ea0b5e 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 70ecdc0c016..ccb16e16836 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 65aeb107327..9ad7f6b2c39 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 c187deee692..b777bfc2d3b 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 bc152e83e0c..fdc0c64fbd2 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 5dc126daf8b..ac86be26878 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 737c58192ed..78d427e5d85 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 30608d849eb..55887eb61eb 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 cd18f7a12af..f68f67aaecd 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 9cbc31eaa38..97dbc102f61 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 23849ee3bf1..5184de6f137 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 109c94289de..07b316d1804 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 b0af484581d..eddd18afe96 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 d37b3ae8fdb..a30a0f96e12 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 22c7bb5c6cd..0c02e78a265 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 afd6bf6e96b..f878bf55413 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 5c273ab0218..ca7ed031ccf 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 e7889e2ec7b..917ebf0865b 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 687e3801eb9..64c4ad0eaf6 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 b9499cb7254..1f3ee5049f1 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 46dfb8626a8..1145a9c462f 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 7d6a22bd792..2cf70c9e3ca 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 d2ab8b5d8ec..e5bf21120bb 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 9e000ab9e56..0507caa8fcf 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 d68134fc03f..9c645a590dc 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 b4f9ce6e117..1825eaf0b41 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 ccf9d035d21..d2ea47180c3 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 898557cceda..54743205843 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 12ac5d042fc..b5518e8079a 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 5327e4ed923..a75024a94c2 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 1386516a95d..35f54351c4f 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 1b9388e6543..bd502a32424 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 11660d5d508..2ad3b54178f 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 004fba4949d..2976ff17cea 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 abd32c47fdf..be7edc85182 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 261ea109ad2..507f4f1e0ba 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 d6e9745272d..0c240bfceef 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 2dd968e6b6c..f88cf0d203f 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 ab5f8565b39..d19a475bd33 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 1c7c7b0ad2f..64d1b6f39a9 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 b3ce348a285..887509c0fee 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 66f736e6bbd..0566d1cfd3b 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 7cac3da4e31..eeb3c00659e 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 5d292fe2c90..e3049cfb63d 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 edb251e14b7..29e9837687c 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 54def8a1e50..c7a1933d8dd 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 20462137968..a807b067235 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 6fc94d6feb7..d10f7c743ee 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 6048284b4d7..b587a6e0e4c 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 8bfab7e5e06..409c3357aa9 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 78700db9595..36a4071931e 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 fac693adedf..d9a0b133c4e 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 8a8febf5e07..67bff75481a 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 893a68255b7..8cc8374b1ee 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 7cdef3f4e99..bbd7d28d284 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 63e3b64fd57..adf462b0256 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 24f92c0f294..2cb96bcda2f 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 b291e55f830..0c445ae7e9f 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 d4c9c953e99..44daad7eda4 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 d2cacaca99e..02e2f6a12a0 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 12c9a163bbb..5cdd77872d9 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 3843341c224..d2e4ee4aea4 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 486da9ae474..09c4c9f3cdb 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 4068be94c23..3e280685893 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 2cd2f722624..47e4edc82d9 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 b2a418c454b..a53d31de226 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 904f176d2d5..e174e16de6c 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 8f9ac8a31b5..f93d1fc5a2d 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 7e53f5371c0..1f46857d73f 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 381356f6c7e..cdec794f522 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 7752fd04278..6fdf512cfb7 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 32f3833aa13..f1ea3776572 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 1788794c5b0..579e08bdeb2 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 203e483e6a0..8f579845de1 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 9ad2468dc52..ee18866be37 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 9f6824b81ab..7a8bbaaacd0 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 cf244462d50..e55d6b8e9d3 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 56db85fd7de..c1690667d52 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 24a41f555be..df0ea2565df 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 ffed7ded644..f8b70aacaf7 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 b4fb6e25671..ad50d3d2521 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 2f786b3be8f..89ca468bcc3 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 3810f91123f..393a39413e5 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 4348cef9001..5fcea10bcc0 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 03562841d8c..5fd4c07bb9a 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 387a6028606..9a930d0feaf 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 67539821613..5e91d7cde51 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 6b1c477bbb0..9223bb2cfec 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 44d0808aa09..1a70d3bc033 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 e6b1b906d7f..42a98fb0721 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 f2ad1bd95c5..5f345fc61a5 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 9a739d39090..f29108a40d0 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 700e859ca68..b7cd1bd48b4 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 7be1eba01a0..bd51a4774b0 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 48140996665..7c23a01b473 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 88a26a59c76..6e08e57db38 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 80920292226..afa9927a58b 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 4f7a16388d0..f8cd594caac 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 b65ca568cdd..2b550ad9d34 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 e2e9c2d2897..95e20e2785d 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 88e79a02048..c0a40854bfd 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 ea1eb8c98cd..409d2ad6de0 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 b69714d2c25..1f06f5ccffc 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 08fe4b728a7..6cd9bde2141 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 dbd184aedee..3a181f06abd 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 34a039aec15..9789ae94fa7 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 33bfb488dc8..08dad264ae3 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 c7f00912c9e..af6d47821a7 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 f394047eeb3..986ae43ab5c 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 f52f46e8f44..7d412588383 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 1305bc77e0d..9ea3c4db924 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 93133cad3d6..174b7518902 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 5e906c8284a..22f440a06ab 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 8a3daac6753..39aa8b0e44a 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 e2213bf2ec6..b4360c9a5f2 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 888cedcf99a..124784a5eae 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 a3a2ab2ba3c..5243628dd0b 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 b8d42293025..ca7e7faf56d 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 84f995e9cf3..b6775095d73 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 f91ee3dec08..ee0ff9096f3 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 @@ int len;
  * 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 c19cc3540cc..02d147c3133 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 9b7e4156a30..197f7a0f421 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 3540119748c..79f1252781c 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 336ff4768cd..fc6acc6c9c8 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 c1c90c04164..83cc650c21a 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 01d6d091797..7d943d6eb54 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 84485e328f9..0dd330fb19e 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 0c78b995ebb..4562672f1e6 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 1838defb6f6..ba5d24f91ad 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 5da488f6594..eaf14935070 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 a3f08b6db1d..33e0187565f 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 81ae4bdb99e..98e8fd433ec 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 bc48c3bd31b..162eaa39225 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 33d8d7a73dc..0912fea898e 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 083d10bd686..786b4e8c766 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 98f86c6410a..52d062dd783 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 aa6f0d719ca..5d18c56e717 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 5fd0a09f08c..9569f48f59a 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 c5e916bbf36..0b6f1b6361d 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 dab93b0ef0c..4afda70b809 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 267c2174342..72e51b22ae1 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 1f91cf3c949..e3fd1fee5f8 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 e4b82b94238..32a13f20f89 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 5bd6a3d057a..66d9e532737 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 98eae820615..55d9614006b 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 6cbdac90533..2dbea5dbf8a 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 e40ef555ae9..79f68964cbc 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 fdebdb0b03e..6c9119b5ee8 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 4ba16301833..4675996cc79 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 7ad47f784b0..de104e55452 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 9122f17a511..c50905042fa 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 7e37d967537..917dbb2bf1f 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 f32bff2a258..49e03c3709c 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 c14a96b81e9..07ac1bb8fb6 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 5a5abc4689e..6bb234b4da1 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 af2f787b029..4dd6c9750d7 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 55b7132a0e3..6cf40de7ab1 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 8a826ed2985..3f73a3e21fb 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 bf63c7694af..20aa381e97c 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 0526bbb18f7..abccedaa02a 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 243c8bb1914..a8f8744f514 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 65ab99dd9ed..d02a8445777 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 e0d8de36f37..32200c1e118 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 31764298d50..e604051aa54 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 a361e9368ad..cd7e9f9a671 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 b6a80549613..d5a36375b39 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 f2ae94bb702..2b7e8989de4 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 1de266497f2..08b3a06d330 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 d1608d54ecb..0985545e110 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 39249a5d1de..74d9ab06393 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 d8117dde0ac..e153cc17cf1 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 89624e30e27..268b54e272c 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 c82049e559f..a01607dac3e 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 a33743b0779..c359cb4034b 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 4a535564dc3..2af6e2b6d0e 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 e0236b063f8..94813ea6914 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 6303221e82b..0fbceb897a3 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 e0236b063f8..94813ea6914 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 8cccf199e10..0ad0fb838be 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 f5c5b10aa41..3320b079dd5 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 00746a5b33d..de7ecc92734 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 a2fcb772125..3c0f39e47a4 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 f5c5b10aa41..3320b079dd5 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 b6d4ae8a591..231da99d6a1 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 e2c448a3cea..eadd4f5b7cf 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 ba2e0f28d8d..2cf3df1d3ba 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 e73e1f4ddbb..635267f065a 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 f086ad8b331..337e796ad07 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 4784a350894..5ede8a6a3d4 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 f23759c5064..5035256f561 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 f92657338f8..3bcf5f0b24b 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 497c05a564e..4bb9124f0f3 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 c4f1864422a..c6ec19e0ded 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 38b2b3c34d2..44634b31a4d 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 5b8b8aa0cf1..4f5721f00fe 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 e8bd9cf80f0..0543df5dab2 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 e732c33b83e..fb5c2fbbcaa 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 7a55c878a59..6b57bdc2cab 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 3f03602dcfc..586f2630556 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 f7b8e594729..36e2b5334fa 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 14afb084657..f2709eb8c8c 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 8106eccb9c0..2e20f0fb45c 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 8d521a01594..acdafe5adcf 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 20a4116c2b1..6fca28a17d7 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 e9b26c38557..d8e0a6f34f0 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 a3f10cb5734..94f2e2f3bbf 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 5fc19d1acb7..602200975fa 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 8a23b0ee047..7418eaced6d 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 ed36a932216..7dfb783ee89 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 3d624233d17..e8327565976 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 6ff4b4f62cf..a03770f02dd 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 13bedb726a9..ce431417740 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 ce58ba1a24f..7af5acf12ac 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 2224534f725..a20b868cab6 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 617fb2c0f2e..1f9a58aad09 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 b72f1994abd..fc4db94bd69 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 d02913e9041..234080130fa 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 a44f36581be..4dfabe7c749 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 363d787e720..21d64a09a8a 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 6eec470fbd7..0c5fbeb8464 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 8b044896d4e..572ed36585f 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 48c8154b1d8..85f7548e68e 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 37b85dc9d16..8b5646a32cc 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 5abf989df6e..1bee0e47281 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 97ab3d9835d..adef4fd64b3 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 02513cdd621..3920f672a21 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 88adcab67d4..840d93a844c 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 6f6e5c2d544..db0d71318a5 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 501c584a58e..7501a0cc988 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 995ae77cb0c..4ab74ce1e25 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 e7c74196f49..e1d88dee9ec 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 d91bf90bae3..32952484de4 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 0610e4a3674..6c889b57f77 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 fc232b9b74b..2127d46a6d2 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 6fd3a89efda..c0cd18fae77 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 9d93fed1f9f..1dad3c43512 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 9ffb490e1cf..d42c5ac645d 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 8533d529231..b13c0099b81 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 77ebecbb355..13ff9b2902a 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 2542ee73f12..32b5d3971b0 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 b5ee411d946..a8ce893d852 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 8949d7a32fd..0059c5119ec 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 b5adf4a74bd..b866cbe6781 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 9ffb490e1cf..d42c5ac645d 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 004bdd2d966..210dde6c5cc 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 89fe668f856..3e90bdb58a8 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 0600c26dd17..f7250cc55c0 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 f499a2c4bae..487e0bf6522 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 8533d529231..b13c0099b81 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 ecb4f058d52..77ac7e32946 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 49adeb21e5c..3bc818ff259 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 665a187dd3b..cbb2832704b 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 dd7ffae6771..44730863301 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 a05ab31b2c3..eec5850bd38 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 6e5f2c55a22..6f8f85e00d4 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 59f64d54777..2ba78aead0f 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 00afefed954..525df093a42 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 bb60dd0aaa2..82ee38ad491 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 d91bf90bae3..32952484de4 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 0610e4a3674..6c889b57f77 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 fc232b9b74b..2127d46a6d2 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 6fd3a89efda..c0cd18fae77 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 9d93fed1f9f..1dad3c43512 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 004bdd2d966..210dde6c5cc 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 77ebecbb355..13ff9b2902a 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 8949d7a32fd..0059c5119ec 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 9ffb490e1cf..d42c5ac645d 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 89fe668f856..3e90bdb58a8 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 0600c26dd17..f7250cc55c0 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 6fd3a89efda..c0cd18fae77 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 f499a2c4bae..487e0bf6522 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 8533d529231..b13c0099b81 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 ecb4f058d52..77ac7e32946 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 49adeb21e5c..3bc818ff259 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 6fd3a89efda..c0cd18fae77 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 6fd3a89efda..c0cd18fae77 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 b5ee411d946..a8ce893d852 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 b5adf4a74bd..b866cbe6781 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 8949d7a32fd..0059c5119ec 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 9ffb490e1cf..d42c5ac645d 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 004bdd2d966..210dde6c5cc 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 8533d529231..b13c0099b81 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 665a187dd3b..cbb2832704b 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 a05ab31b2c3..eec5850bd38 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 6fd3a89efda..c0cd18fae77 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 657c97159d0..7aa65288a00 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 953b4169d1f..412047be2ca 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 a79d3e239a2..bdec08cc3e7 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 197adf11d9e..9f714382c2e 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 e7955452790..50ee7ac1735 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 1b9c3dcd48a..16132a90f91 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 0b6f6a202b2..a6133855280 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 46b45de3d1a..b3e75b334d8 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 ca5f45cd463..f0b9a8a1df4 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 44877bd2e5d..183d5dcd03c 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 015684c9031..d7f5f5d26a1 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 fff9add0a32..578f8bf62df 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 1e6d322c719..0a1f7918e38 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 4af81f7ab1f..904c72fd778 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 88916943ec9..a3603a63e93 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 3a2640c950d..925028d109a 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 e9423ecc1fd..3d7c09da596 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 e5562c096a8..73d090a404b 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 bf47e6c4a47..7edcdeec060 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 77a4b2f261d..f14c7f55104 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 b90bbcebf15..6f4bcc39e52 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 2d456512c1e..88d9506c46b 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 5de351fe822..c225bd35bda 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 32941f9ea41..4e32192eebc 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 0d38ebce98c..ad9d3ff74d8 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 0e4b6f3f30b..3b540dd1c89 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 2cc22465fe7..f2df31aec6c 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 013a40b142e..a7e69355d62 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 ab70bbe0dbf..1b138b36d47 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 4542942b796..81dc130a031 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 beb70a5e56c..6bf04e18bdd 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 adf721c3ec1..accc948c6b4 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 7aafe0de65f..be5f4cab8f7 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 50abf697504..e148441fb84 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 9bf92aeb2cd..10573944d47 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 eb9636363b1..ba644841a9e 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 feae6090143..267eefc4864 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 b02fc4f1e7e..ae95cf28388 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 4702090d54c..64da3026382 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 fd352912841..cb4b8d03b86 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 bcc707768b3..bbd10a477ad 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 eb9636363b1..ba644841a9e 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 e21d8413f3d..266c0154048 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 3acbbf62cdf..4e85f41cb95 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 e48c5e2209a..be8419f2df0 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 68730e5f151..ba28a7022de 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 2f6f49dbb40..6be4a99cb09 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 857bd2b1c8c..565b27ddcde 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 51d0917d678..8bf43db127d 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 1c47ba7ac6f..05c3b8bf2eb 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 1c47ba7ac6f..05c3b8bf2eb 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 8740d2398e8..48492d5fc6e 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 0de2c6f1cc8..0e3045546c9 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 359b379f403..84d3f62a989 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 50265b21d20..7d56998aa18 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 3c46c2decce..9906c9b413e 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 52f786f19c6..939e2289b29 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 c52b97a6141..b2859eaf14d 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 b2c1d38a4bb..ee18554b8ce 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 eb9636363b1..ba644841a9e 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 3841c814c72..1bc1e7653ad 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 feae6090143..267eefc4864 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 b02fc4f1e7e..ae95cf28388 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 53aad1eeb49..2f8d4a29bcf 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 a7e4a0510f0..44b77f41de8 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 9bf92aeb2cd..10573944d47 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 52f786f19c6..939e2289b29 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 b82d1d37bfd..23ce0f88e66 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 d44207eba14..786b0178053 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 fd352912841..cb4b8d03b86 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 b7d96a10e29..8517f9723bb 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 50abf697504..e148441fb84 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 4702090d54c..64da3026382 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 bcc707768b3..bbd10a477ad 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 5c8dbf27a1f..e6181d93ef1 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 e21d8413f3d..266c0154048 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 3acbbf62cdf..4e85f41cb95 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 e48c5e2209a..be8419f2df0 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 68730e5f151..ba28a7022de 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 2f6f49dbb40..6be4a99cb09 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 857bd2b1c8c..565b27ddcde 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 44b2dd67d19..1d131886253 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 85a547c1fd2..c3fb5b18048 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 51d0917d678..8bf43db127d 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 1c20cb6fc6b..4f118d04972 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 865f82bae6a..72412a93133 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 a089527fa1e..f7837d7407b 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 7337796969a..5dae30e4e97 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 07be6c1c21e..6497ce4c504 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 34ae30c7c54..5988089d43c 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 e596a75fbce..5b23c5e57c2 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 47934f3d02a..bd8e06c79e4 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 1ca2cee1e59..8f8fc58f374 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 65097863054..10eda815814 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 54f429f9bab..64fcbd53c8f 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 4f98d1a4429..ff4c5d3fb43 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 ab34cec12cd..643d3f353f5 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 27b73d013a7..46cf72e121e 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 a3a1fdd737d..5e4ecc9a8f2 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 c7d22c50484..075e9885ae5 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 5aa88444449..154a2f2febc 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 61848c3213d..71e16953af7 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 150dc54ae57..707c4db62fe 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 3828d08b6cb..9df90db97c0 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 4db7bf985f5..fe7206a1882 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 dff26f8fb6a..d1370aa08f5 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 72546c61449..a1adc354be7 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 330ce7ca194..70007fb87d4 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 d71bfcc4f54..9870df27ff5 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 769645f3313..1f1c540be30 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 05ea4176fa9..5d07973947a 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 6d8e354779f..2af519bd35c 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 e9612ee3e22..da6637f5324 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 0e17fa5aa72..669234a8075 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 5f9d2682061..023457e37c3 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 7d816b8c807..d70628a9e70 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 724668c1a32..ee97515fc15 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 d6db196244d..e593608f0c3 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 042d2df9628..7c4717db941 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 c92ffc083bc..33c7212295e 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 5dca10c5bc5..a6fbdb4486c 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 5755826ee51..c19e8911f36 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 02d5a4802cf..c3744dbe405 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 70723530802..0c567d0178d 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 223f8784c4d..657aabbf88f 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 f064ef6cd2f..5eff4a42b2b 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 e4de7e6956d..9a79c263529 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 4ead87013a3..e5149aef95b 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 aee546f554b..4038967091a 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 f03aeff3670..b0eaa90fce6 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 260f5ef0c5d..04d0db82c41 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 6b5bfd4d0e4..d8085782feb 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 78bc215c002..4fe1a0f85de 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 c83deefacdd..5195324852b 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 09b198230eb..36bbaddff5a 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 bfa0e3db1c5..80fc4aad8a0 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 e9ef74dfede..b06f5e9a94c 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 b7cdc5d3c4c..6830e10690c 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 5d0d89570d7..5efe056267f 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 2f91c23b250..cae329a5761 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 e1e4ae6d1cf..fef8e48fc39 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 1ea58f4144b..fb635b2cd5e 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 ed8b35afb2c..5411339fd40 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 be5b83ea5d1..04d76a7a083 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 c74824612f0..b50f068e3f4 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 7163d37998e..e90466b4562 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 fdadef07e15..73816e7748d 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 8fd49bbfd56..1aa31953b36 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 03256db1e12..6b166b300af 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 2b5c92572dc..fcc72124377 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 75f41e87c72..214d6f96b80 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 db4d56afa76..c007dc57706 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 b2fa6758fef..95b0081ca32 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 e596a75fbce..5b23c5e57c2 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 47934f3d02a..bd8e06c79e4 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 9c0dba09331..f90df10e14d 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 a5882df530b..e883b5f2f28 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 f1c6f5e4d74..ae4958dbf26 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 7a9954b1409..2a9a706b311 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 46093547cf0..e703074e58c 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 51bc01498ad..8d4ae4dd1ea 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 e2ee31f7e4c..e46ac964014 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 fe8946bdabd..f649e93a044 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 e34e3c2e65e..1b56e6bb278 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 73319ece792..b96e9eb2637 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 4f92cf697bf..2f0dabb9480 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 fe6041b4c4b..0d258ff9d94 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 cd45e408d85..86b7e7a729b 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 e1915230a84..f243f8b2033 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 fe6041b4c4b..0d258ff9d94 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 94e87ffd7d8..42d40f3f2df 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 2c43a2eef8d..55a26fd636a 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 646e3536573..5582fcb1337 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 945f537aadd..dc838f71ace 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 cfaa023fd01..000eb02a0a7 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 4f92cf697bf..2f0dabb9480 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 d8fd59b7fb3..670fccb6a66 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 5fcfcb5bafc..707e7e4d3ac 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 a42d49d4f9d..52910bf349c 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 f1a405f2fd6..6d9454f65ec 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 26ee8164aeb..24407822788 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 50dd46a4312..cc39929acfd 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 301915940bd..716dad18924 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 add04e382f7..60b975966a4 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 6ee21fae833..615e09c219f 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 9dfeced92f6..0be9f221c7b 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 254e2da813c..37184cb7261 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 bc726c12cef..25cdcf13e0b 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 8fc0231f464..c160b8eeb6e 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 02c12021763..401c58b2a96 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 f95e5ee5345..a5c6a532418 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 1f9b7573cc7..f884fa16c4e 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 56d7f5572be..6aadb7e050e 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 35aa8e603e6..9535cba8972 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 77500fad8a3..db7c3dacef5 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 32717998d72..7c39f44b3a1 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 caab421cd6c..3512df38767 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 0f4c3e28f7c..be898374dc2 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 2e1e088f902..b1239871942 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 0b02985068d..8fb861d2014 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 f4269007159..e2eafa304e5 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 e7ee86b9b5f..96e3582738f 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 c0c9767bc6d..7d618461276 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 f363caaddcb..dd4e220c9f4 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 36e0a8a24b6..927ba0d2836 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 2b6755127dd..9ffcbc58d75 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 082cb409f78..7eeff44f30a 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 cc904abb89e..b3bf473a1b5 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 41709258bd8..4ced1bc07f3 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 52badbb502e..2fa14a1e988 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 331fa7ebaa0..874c5653e63 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 0e05a658d0b..40bc2b85d75 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 95427ec67a9..099bb9c4dfa 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 45525a23060..450c0847a99 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 f7eddd44366..8afa4f321bc 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 cc9d7a7a186..3d61771fc90 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 7d98e05d782..f0c508f511b 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 ac4c1d62c8e..d597691cc69 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 81ea51448fd..c578170a1ef 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 2aed74e4ff8..410746b6adc 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 c37865283da..04bebe6eb81 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 bd83d721abb..0735d42f722 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 3c805a4feb4..0033c96bae0 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 a2f28e34041..629edd69cd4 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 e104778c9d1..a3714c9b1c1 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 2945c194827..9a92c0114c1 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 5c01a85cad7..46f7bd3df7b 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 703120d7d23..43e8f4886c6 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 b64222051d8..ea0436a93b5 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 471baa97b75..4a0fee85f7f 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 e38675d1ae5..d59d974cb41 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 251d354272d..68a5698503d 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 609a37072f9..f84498589ed 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 05d82398d1b..a26932cae89 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 609a37072f9..f84498589ed 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 f02b3190d84..03a644975cc 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 28e80ba2b89..b6a9795a5ae 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 f3539a3d4da..27b0a6c0e29 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 ddb830b866d..971ac9f8807 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 862419dc3ff..82ac51d9b55 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 587e7d72eca..f062c772da7 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 516e67abe0b..dbb0f29f9ab 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 3e0cea197ba..7a2403f27dd 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 5e87f2b11cd..d1c22fa3d59 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 00645fb949b..4e5a94a5aba 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 a626091976e..b6414a1244c 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 abc9c1fca1e..d121457cfc6 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 18c0b246ec9..becc5474d37 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 fd66d85b4a6..478adc0a4a9 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 5425d7728ad..fc5ce337439 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 c94b8ce2358..8887744ea30 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 bea51b01eb0..670850ac37e 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 33b2d7f9186..19db37ba43e 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 1e3865c9000..e664e26743e 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 1e3865c9000..e664e26743e 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 1e3865c9000..e664e26743e 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 881cf3048d7..418df7cc6c6 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 a076e00444f..4aad13214f4 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 d7abbb19244..c62d6ce1350 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 d31bbc0eba4..79317608673 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 0bf516be15d..3b7f14c37aa 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 d88ef2c3252..309f1a43ead 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 464815a27d9..022b174f559 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 7785d202f15..207050debe0 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 bc1203b69a4..32c3e161b5a 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 0ccb10528b5..c25b6afef90 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 b0198daf30a..4ebdc2112d8 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 ef643ec89ea..d58fbe89ac4 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 055dfad49ae..b2413ead61e 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 7133e17bbf6..b81f904daab 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 891d8f0a22a..3b4da37da23 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 ec425b4c541..072a7652fc4 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 92b5562ff91..4505875fe5c 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 d0c94af7b64..07dff626656 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 9107c93f071..79434a4888a 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 d206f268a18..ec147ba8698 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 f05c0026c55..5b4b68fcbdb 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 618abec7427..596ecdbb14d 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 73d9175e8ff..8b1e95de195 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 6c717030b61..01b45cb9f87 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 824786a65aa..f1d94c615e7 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 26cd972aef1..3dc3c1e0164 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 48e01839547..11a22c60434 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 0767abddb68..30e18d156da 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 ab067b97e42..baf42e090f8 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 cb7ff9ece4e..d81c5bc9d11 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 ca6fb944edc..560f4b85866 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 c8e99471e67..2712a125de2 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 5a2b617a448..c6d984c1bb0 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 b0382bd7a1e..b88b2b62c11 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 bdc060346a6..6f7c4ae90a5 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 00645fb949b..4e5a94a5aba 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 0c0cfa1d354..407aba14f8d 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 837da207f7a..a4736a56707 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 67a56d97b97..04157c0fc3d 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 2bd1898bdaf..17980f6a1bb 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 67a56d97b97..04157c0fc3d 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 c1fc86d7516..bf85c33db3d 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 959b70b073e..475b997ab6c 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 1b636b59015..a69f7909956 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 7329d8f7ae4..d5257ea6953 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 45f3a405990..83cea0d5146 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 a988d3f5894..625d12d9f56 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 98cc0ad38a0..12d49a2a5d7 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 7b998c2ff4f..3dd70f1bc89 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 4cfd004e49f..aa7df03e791 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 1a91daf0c7f..30b8b993819 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 5c41f34269a..c4611d9c3fc 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 ef89e207e8f..b61279471c5 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 8c936a03079..b43a47ff5bf 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 9b06500d75c..e95f4553453 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 9e8986aae76..7620a39bd51 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 f735c218130..7885af31d6d 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 d0656861cc6..04f0e1c71a8 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 99a1d92dd73..15f6e13aef5 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 dd4f1492c88..1292280528d 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 288a0fa2766..f7f77edeec8 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 fd4df60a60d..4bf34b8d720 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 569173a1a6a..e084f8111d1 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 d9678bcf09a..d0c4210515e 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 7e09e86dadc..3dc21820fb5 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 9e476eccce2..eca8e47d968 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 278e33cba9d..6283f315ce1 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 6f196ab1c0b..5d115f5693d 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 b7cbfd4136c..b49c8d6707d 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 e69971e3b68..89e7f9adcbb 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 e69971e3b68..89e7f9adcbb 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 b51fc246752..798f5bb7d12 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 0e8bf40783b..a792f561b11 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 471baa97b75..4a0fee85f7f 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 e2bdb4a97c6..058f0f1562d 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 2a519affb50..e93eb3bbcaa 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 c425db6f7d3..0524d76b6fb 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 b7da75a1c51..a7b88d464b2 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 8fb052c297c..fb1542582c8 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 36f0c2e213b..afefc83d7f2 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 52a1a416601..f6dc2319ca3 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 c4011156534..b776b22531c 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 9bfc9788eca..ab258c2e5ea 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 3546e6b1d37..634db8f3b3c 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 0a9df010ce3..8359101a59e 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 e2fdc9ff4dd..9ed5a11fff6 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 e934d3c3dca..5caa181af9f 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 09025b4ab34..72f4b9e060c 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 32ea4a0d8f9..1742eb4c837 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 be00cda0426..40aba11ae6b 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 b278aa14b8b..58e562f3612 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 6482d3c9201..043d37670b0 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 961ebfd1826..ba6dee0ed70 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 32ea4a0d8f9..1742eb4c837 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 239bb52a78e..ef5660907ad 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 63a49e90417..00fb7a8ad5c 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 3b96b40ab7d..d9b59b7f01e 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 a181b77daa5..ac6c45a4159 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 f6f8f48a981..6d23e3bdd07 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 79e54f4611c..739ec477c61 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 cd42c19516c..bc9c0d44b2d 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 f65dbe05f0c..6009f93a675 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 5373f886fbe..e55b8405556 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 36dd7257b31..a99ba68d9a1 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 d6216039f6b..7503cddf257 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 7c3881267ef..c0b8a373a19 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 37fe257a420..62ea5c53069 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 0387cc1d206..375c3d403f3 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 28b29582efd..cf179f04c07 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 36d3cf83b29..837255cf6dd 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 6a63166b345..a5a86d7f65b 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 b476d00bac8..e382d900f6d 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 b9c43e37fc4..e78db431788 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 93a1c70bcd2..702e71dce2b 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 b0716d27fa7..c854e149d3c 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 a5eca5631e1..70de800d9a4 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 c6872bc5a8e..1863a227ab7 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 c6872bc5a8e..1863a227ab7 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 07e0e91781c..9c042dbac7d 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 8e205129bea..74443805a33 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 5b3df8b6588..ebd630f45c7 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 169bf30bdd4..177a820fd21 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 0895173b665..aad428527ae 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 a396960312d..652e20ba3cd 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 5052b89f8a8..f005c71171a 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 a3dfe4f0d22..0256ee2244b 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 37c82cc883a..3efbdebb8f3 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 dbf2a913b4b..59b8dcdbdee 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 9f997318f99..91979d87cef 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 f6dc287736c..e146382e3be 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 87b129a32dd..044bf634390 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 c2a5fbd03fa..ad691df4e91 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 f56d4da7101..da428144b9a 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 0b8b6094747..461a6c0bdf2 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 6a7a853035b..a8948b9aaef 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 77fe7b3983b..78fbc0adaff 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 e5ce29b8bf1..f449a1a5d88 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 9a477c51fb4..cf564071491 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 a46e11ab7b0..a52efbd9ef5 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 7798b975c9d..ee2779d7877 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 c2dd63e5b7f..0a7c7d58319 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 1f4e0b1af8d..edb8c153f19 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 29e522768a9..020750d5ddc 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 99c35c7b571..e1b5b5d986f 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 ad89a319503..59f064e20ad 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 55eb12db35e..f1284008a81 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 e474bdab5b1..e95c5e962c8 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 70652b58f9b..44974548e70 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 a850260dd7d..91115f4115a 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 58911450a5e..842969accd4 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 0652b277cab..d08c14bc5d0 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 32d1846e15b..194ac283b30 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 9ba17705694..a3e603b1d70 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 50acaf115dc..4557036b8a5 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 19ea10e5eb7..1fd27452dd0 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 93c9c606afa..c8b90ba7232 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 dd53ad9c57b..7431e53418d 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 a83d029a571..e53079a43a0 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 b3cfbd81263..8d7b7f6df50 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 4eb8acce353..f7f1df84a19 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 6602ee57a7e..409c5f487fd 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 0f470bd3c7c..9be497653d8 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 6ea4395b3b8..03633e99d95 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 f12c042cd6e..c5fbee562cb 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 1f355d4e682..4e7f0fb12c3 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 fe9bf90427b..9fb8458bc1a 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 7ff5175a73b..0ed361db755 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 62e52e9ee28..385ef70ca0d 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 c384580c017..f6db00ef98a 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 7a93d18b2d5..6ffb8676eeb 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 7ce3a3a7f7a..bc8784cc587 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 68c0561fc5e..7af6b06ff0f 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 f4639e5b342..70452ed04eb 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 aff14ab29ae..d5df7c8f0ec 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 a3680c48c69..66733cc4b1c 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 cdddcea786a..68e552e018a 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 a2218cdbc44..8a178bd895c 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 d095283888b..f81101b2e78 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 0d684a74d32..3befc9119c0 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 8fe91d1e1aa..b8aa933b3c3 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 c44391c1ee9..367d3a39f39 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 b833e635ff2..339851d21b6 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_
diff --git a/tools/3.0-upgrade/cvt-wtmp.c b/tools/3.0-upgrade/cvt-wtmp.c
index f5d3653710b..c5d3b54a7bb 100644
--- a/tools/3.0-upgrade/cvt-wtmp.c
+++ b/tools/3.0-upgrade/cvt-wtmp.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: cvt-wtmp.c,v 1.4 1997/02/22 14:08:01 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/tools/LibraryReport/LibraryReport.tcl b/tools/LibraryReport/LibraryReport.tcl
index 37b4379bf6c..fbf63896c71 100755
--- a/tools/LibraryReport/LibraryReport.tcl
+++ b/tools/LibraryReport/LibraryReport.tcl
@@ -50,7 +50,7 @@ exec tclsh $0 $*
 #
 ################################################################################
 #
-# $Id$
+# $FreeBSD$
 #
 
 #########################################################################################
diff --git a/tools/diag/ac/ac b/tools/diag/ac/ac
index f2815e5eca3..6bff17339a1 100644
--- a/tools/diag/ac/ac
+++ b/tools/diag/ac/ac
@@ -4,7 +4,7 @@
 #
 # ac - check if the FreeBSD handbook is in sync with the committers list
 #
-# $Id$
+# $FreeBSD$
 
 : ${CVSROOT=/usr/cvs}
 contrib=src/share/doc/handbook/contrib.sgml
diff --git a/tools/diag/httpd-error/httpd-error b/tools/diag/httpd-error/httpd-error
index b1ff405321c..6882067d75d 100755
--- a/tools/diag/httpd-error/httpd-error
+++ b/tools/diag/httpd-error/httpd-error
@@ -4,7 +4,7 @@
 #
 # httpd-error - check for Web files which does not exists on your host
 #
-# $Id$
+# $FreeBSD$
 
 mode=${1}
 
diff --git a/tools/test/devrandom/hammer.random b/tools/test/devrandom/hammer.random
index a619816f2db..ea4cb5f6403 100644
--- a/tools/test/devrandom/hammer.random
+++ b/tools/test/devrandom/hammer.random
@@ -5,7 +5,7 @@
 # Read and display random numbers.
 # Try tapping shift/alt/ctrl to get more randomness.
 #
-# $Id$
+# $FreeBSD$
 #
 
 for (;;) {
diff --git a/tools/test/devrandom/hammer.urandom b/tools/test/devrandom/hammer.urandom
index 4e434fae547..d0b6aa89da5 100644
--- a/tools/test/devrandom/hammer.urandom
+++ b/tools/test/devrandom/hammer.urandom
@@ -5,7 +5,7 @@
 # Read and display random numbers.
 # This also reads /dev/zero to make sure there is no brokenness there.
 #
-# $Id$
+# $FreeBSD$
 #
 
 open(ZERO, "/dev/zero") || die "Cannot open /dev/zero - $!\n";
diff --git a/tools/test/devrandom/stat.16bit b/tools/test/devrandom/stat.16bit
index 83398d5d273..32a6a9caf55 100644
--- a/tools/test/devrandom/stat.16bit
+++ b/tools/test/devrandom/stat.16bit
@@ -8,7 +8,7 @@
 # Redirect the output from this to a file - and go to the movies while
 # it runs. This program is a CPU Hog!
 #
-# $Id$
+# $FreeBSD$
 #
 
 for ($i = 0; $i < (1024*64); $i++) {
diff --git a/tools/test/devrandom/stat.8bit b/tools/test/devrandom/stat.8bit
index 5c304cb2e68..03fdbdd5b39 100644
--- a/tools/test/devrandom/stat.8bit
+++ b/tools/test/devrandom/stat.8bit
@@ -8,7 +8,7 @@
 # Redirect the output from this to a file - and make a cup of coffee while
 # it runs. This program is a CPU Hog!
 #
-# $Id$
+# $FreeBSD$
 #
 
 for ($i = 0; $i < (1024*32); $i++) {
diff --git a/tools/tools/README b/tools/tools/README
index b305823f616..4ae496136dd 100644
--- a/tools/tools/README
+++ b/tools/tools/README
@@ -1,4 +1,4 @@
-#	$Id: README,v 1.14 1998/12/17 12:21:19 cracauer Exp $
+# $FreeBSD$
 
 This directory is for tools.
 
diff --git a/tools/tools/diffburst/Makefile b/tools/tools/diffburst/Makefile
index 4e58e4cdd86..6cec60ba256 100644
--- a/tools/tools/diffburst/Makefile
+++ b/tools/tools/diffburst/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1997/12/06 00:44:04 archie Exp $
+# $FreeBSD$
 
 PROG=		diffburst
 SRCS=		main.c
diff --git a/tools/tools/epfe/epfe.pl b/tools/tools/epfe/epfe.pl
index 4afd824d479..0aea2c247a6 100644
--- a/tools/tools/epfe/epfe.pl
+++ b/tools/tools/epfe/epfe.pl
@@ -7,7 +7,7 @@
 #	$ cd /usr/share/examples/printing
 #	$ epfe < ../../doc/handbook/printing.sgml
 #
-# $Id$
+# $FreeBSD$
 
 $in = 0; @a = ();
 sub Print { s/\&amp\;/&/g; push(@a,$_); }
diff --git a/tools/tools/html-mv/html-mv b/tools/tools/html-mv/html-mv
index c91f53362b5..29ea1f2db81 100644
--- a/tools/tools/html-mv/html-mv
+++ b/tools/tools/html-mv/html-mv
@@ -17,7 +17,7 @@
 # FAQ_Can_FreeBSD_handle_multiport_serial_cards_sharing_irqs_.html
 # [...]
 # 
-# $Id$
+# $FreeBSD$
 
 case $# in 0)
 	echo "usage `basename $0` file"
diff --git a/tools/tools/ifinfo/Makefile b/tools/tools/ifinfo/Makefile
index 740a553e275..2fe0e83260f 100644
--- a/tools/tools/ifinfo/Makefile
+++ b/tools/tools/ifinfo/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	ifinfo
 SRCS=	ifinfo.c rfc1650.c
diff --git a/tools/tools/ifinfo/ifinfo.c b/tools/tools/ifinfo/ifinfo.c
index b6d837c7ed9..63fad7e75fa 100644
--- a/tools/tools/ifinfo/ifinfo.c
+++ b/tools/tools/ifinfo/ifinfo.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ifinfo.c,v 1.3 1997/02/22 14:08:24 peter Exp $
+ * $FreeBSD$
  */
 #include <sys/types.h>
 #include <sys/socket.h>		/* for PF_LINK */
diff --git a/tools/tools/ifinfo/ifinfo.h b/tools/tools/ifinfo/ifinfo.h
index 24bd4761a2a..c05a8b82eca 100644
--- a/tools/tools/ifinfo/ifinfo.h
+++ b/tools/tools/ifinfo/ifinfo.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 #ifndef	ifinfo_h
 #define	ifinfo_h	1
diff --git a/tools/tools/kdrv/KernelDriver b/tools/tools/kdrv/KernelDriver
index 1644753a529..b840ff48150 100755
--- a/tools/tools/kdrv/KernelDriver
+++ b/tools/tools/kdrv/KernelDriver
@@ -73,7 +73,7 @@ exec tclsh $0 $*
 #
 ################################################################################
 #
-# $Id: KernelDriver,v 1.4 1998/05/04 03:30:43 doconnor Exp $
+# $FreeBSD$
 #
 ################################################################################
 
diff --git a/tools/tools/kdrv/sample.drvinfo b/tools/tools/kdrv/sample.drvinfo
index 7618d0b549e..eeb6a254d08 100644
--- a/tools/tools/kdrv/sample.drvinfo
+++ b/tools/tools/kdrv/sample.drvinfo
@@ -2,7 +2,7 @@
 # Sample driver information file for KernelDriver.  See the top of
 # the KernelDriver script for a more exact definition of the syntax.
 #
-# $Id: sample.drvinfo,v 1.2 1998/05/06 05:45:17 msmith Exp $
+# $FreeBSD$
 
 # Device driver name
 #
diff --git a/tools/tools/kernxref/kernxref.sh b/tools/tools/kernxref/kernxref.sh
index 60973b073aa..956ad515499 100644
--- a/tools/tools/kernxref/kernxref.sh
+++ b/tools/tools/kernxref/kernxref.sh
@@ -7,7 +7,7 @@
 # this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 # ----------------------------------------------------------------------------
 #
-# $Id: kernxref.sh,v 1.11 1998/12/08 08:14:37 archie Exp $
+# $FreeBSD$
 #
 # This shellscript will make a cross reference of the symbols of the LINT 
 # kernel.
diff --git a/tools/tools/mid/mid-index b/tools/tools/mid/mid-index
index 053c21e8e95..a5ec10b78f3 100755
--- a/tools/tools/mid/mid-index
+++ b/tools/tools/mid/mid-index
@@ -2,7 +2,7 @@
 #
 # create message-id / in-reply-to database
 #
-# $Id: mid-index,v 1.5 1998/04/13 13:08:47 wosch Exp $
+# $FreeBSD$
 
 sub usage { die "usage: mid-index name < filelist"; }
 
diff --git a/tools/tools/portsinfo/portsinfo.sh b/tools/tools/portsinfo/portsinfo.sh
index e1c3fd3b885..f3dcf5039b9 100644
--- a/tools/tools/portsinfo/portsinfo.sh
+++ b/tools/tools/portsinfo/portsinfo.sh
@@ -3,7 +3,7 @@
 #
 # portsinfo - Generate list of new ports for last two weeks.
 #
-# $Id: portsinfo.sh,v 1.3 1997/09/29 18:16:38 wosch Exp $
+# $FreeBSD$
 
 PATH=/bin:/usr/bin:/usr/local/bin:$PATH; export PATH
 
diff --git a/tools/tools/scsi-defects/scsi-defects.pl b/tools/tools/scsi-defects/scsi-defects.pl
index 5f48ec01c5a..0827182d6e5 100755
--- a/tools/tools/scsi-defects/scsi-defects.pl
+++ b/tools/tools/scsi-defects/scsi-defects.pl
@@ -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/tools/tools/tcl_bmake/mkMakefile.sh b/tools/tools/tcl_bmake/mkMakefile.sh
index 0c2ca73d473..f49a79eac3a 100644
--- a/tools/tools/tcl_bmake/mkMakefile.sh
+++ b/tools/tools/tcl_bmake/mkMakefile.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Id: mkMakefile.sh,v 1.28 1998/01/17 15:52:22 bde Exp $
+# $FreeBSD$
 #
 # This script generates a bmake Makefile for src/lib/libtcl
 #
@@ -45,7 +45,7 @@ echo '#
 # Please change src/tools/tools/tcl_bmake/mkMakefile.sh instead
 #
 # Generated by src/tools/tools/tcl_bmake/mkMakefile.sh version:
-# $Id: mkMakefile.sh,v 1.28 1998/01/17 15:52:22 bde Exp $
+# $FreeBSD$
 #
 ' | tr -d '$' >> ${LIBTCL}Makefile
 
diff --git a/tools/tools/upgrade/getosreldate.sh b/tools/tools/upgrade/getosreldate.sh
index cb23ef310d1..3c9564851e1 100755
--- a/tools/tools/upgrade/getosreldate.sh
+++ b/tools/tools/upgrade/getosreldate.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Id$
+# $FreeBSD$
 
 RELDATE=`sysctl -n kern.osreldate 2>/dev/null`
 if [ "x$RELDATE" = x ]; then
diff --git a/tools/tools/upgrade/move_aout_libs.sh b/tools/tools/upgrade/move_aout_libs.sh
index 7d9600ffbb6..b00af520437 100755
--- a/tools/tools/upgrade/move_aout_libs.sh
+++ b/tools/tools/upgrade/move_aout_libs.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$Id: move_aout_libs.sh,v 1.4 1999/02/01 12:45:03 jkh Exp $
+# $FreeBSD$
 # 
 # Search for a.out libraries and move them to an aout subdirectory of
 # the elf library directory.
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index ff5f87564da..f03d0cd658f 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 1/7/94
-#	$Id: Makefile,v 1.127 1999/04/18 15:56:20 peter Exp $
+# $FreeBSD$
 
 # XXX MISSING:		deroff diction graph learn plot
 #			spell spline struct xsend
diff --git a/usr.bin/apply/apply.1 b/usr.bin/apply/apply.1
index 5c69684fff4..4631cdb1b92 100644
--- a/usr.bin/apply/apply.1
+++ b/usr.bin/apply/apply.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)apply.1	8.2 (Berkeley) 4/4/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 4, 1994
 .Dt APPLY 1
diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile
index 7392d139db4..af316125196 100644
--- a/usr.bin/ar/Makefile
+++ b/usr.bin/ar/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.7 1998/10/10 12:48:48 bde Exp $
+# $FreeBSD$
 
 PROG=	ar
 CFLAGS+=-I${.CURDIR} -Wall
diff --git a/usr.bin/ar/ar.1 b/usr.bin/ar/ar.1
index e9118e7f2e5..3741299cb8a 100644
--- a/usr.bin/ar/ar.1
+++ b/usr.bin/ar/ar.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ar.1	8.1 (Berkeley) 6/29/93
-.\"	$Id: ar.1,v 1.4 1997/02/22 19:54:01 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 29, 1993
 .Dt AR 1
diff --git a/usr.bin/ar/ar.1aout b/usr.bin/ar/ar.1aout
index e9118e7f2e5..3741299cb8a 100644
--- a/usr.bin/ar/ar.1aout
+++ b/usr.bin/ar/ar.1aout
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ar.1	8.1 (Berkeley) 6/29/93
-.\"	$Id: ar.1,v 1.4 1997/02/22 19:54:01 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 29, 1993
 .Dt AR 1
diff --git a/usr.bin/ar/ar.5 b/usr.bin/ar/ar.5
index 2e3d336c912..e163cf6cf79 100644
--- a/usr.bin/ar/ar.5
+++ b/usr.bin/ar/ar.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ar.5.5	8.1 (Berkeley) 6/9/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt AR 5
diff --git a/usr.bin/ar/ar.c b/usr.bin/ar/ar.c
index b2c85fc7953..c53c1e44dcf 100644
--- a/usr.bin/ar/ar.c
+++ b/usr.bin/ar/ar.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ar.c,v 1.6 1997/06/23 06:41:30 charnier Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/at/Makefile b/usr.bin/at/Makefile
index 393af838787..df96d573b49 100644
--- a/usr.bin/at/Makefile
+++ b/usr.bin/at/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.8 1998/09/19 22:42:03 obrien Exp $
+# $FreeBSD$
 
 .include "${.CURDIR}/Makefile.inc"
 
diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c
index d21dfd39c92..017bfdc0f14 100644
--- a/usr.bin/at/at.c
+++ b/usr.bin/at/at.c
@@ -92,7 +92,7 @@ enum { ATQ, ATRM, AT, BATCH, CAT };	/* what program we want to run */
 
 /* File scope variables */
 
-static const char rcsid[] = "$Id: at.c,v 1.15 1998/12/06 07:42:09 archie Exp $";
+static const char rcsid[] = "$FreeBSD$";
 char *no_export[] =
 {
     "TERM", "TERMCAP", "DISPLAY", "_"
diff --git a/usr.bin/at/at.man b/usr.bin/at/at.man
index 02c79306e98..b6dd8288b65 100644
--- a/usr.bin/at/at.man
+++ b/usr.bin/at/at.man
@@ -1,4 +1,4 @@
-.\" $Id: at.man,v 1.10 1999/08/15 08:25:13 mpp Exp $
+.\" $FreeBSD$
 .Dd April 12, 1995
 .Dt "AT" 1
 .Os FreeBSD 2.1
diff --git a/usr.bin/at/panic.c b/usr.bin/at/panic.c
index c111dd82338..6098c9501e9 100644
--- a/usr.bin/at/panic.c
+++ b/usr.bin/at/panic.c
@@ -38,7 +38,7 @@
 /* File scope variables */
 
 static const char rcsid[] =
-	"$Id: panic.c,v 1.7 1997/06/23 06:44:18 charnier Exp $";
+  "$FreeBSD$";
 
 /* External variables */
 
diff --git a/usr.bin/at/parsetime.c b/usr.bin/at/parsetime.c
index dd1fd907de9..df7fe30ea61 100644
--- a/usr.bin/at/parsetime.c
+++ b/usr.bin/at/parsetime.c
@@ -148,7 +148,7 @@ static int sc_tokid;	/* scanner - token id */
 static int sc_tokplur;	/* scanner - is token plural? */
 
 static const char rcsid[] =
-	"$Id: parsetime.c,v 1.16 1998/12/06 07:42:09 archie Exp $";
+  "$FreeBSD$";
 
 /* Local functions */
 
diff --git a/usr.bin/at/perm.c b/usr.bin/at/perm.c
index 398b2a89a74..9c17863c00f 100644
--- a/usr.bin/at/perm.c
+++ b/usr.bin/at/perm.c
@@ -48,7 +48,7 @@
 
 /* File scope variables */
 
-static const char rcsid[] = "$Id: perm.c,v 1.6 1998/12/06 07:42:09 archie Exp $";
+static const char rcsid[] = "$FreeBSD$";
 
 /* Function declarations */
 
diff --git a/usr.bin/banner/banner.6 b/usr.bin/banner/banner.6
index 2d773715a33..119a3e822c7 100644
--- a/usr.bin/banner/banner.6
+++ b/usr.bin/banner/banner.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)banner.6	8.2 (Berkeley) 4/29/95
-.\"	$Id: banner.6,v 1.2 1997/08/23 15:49:52 joerg Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 29, 1995
 .Dt BANNER 6
diff --git a/usr.bin/basename/basename.1 b/usr.bin/basename/basename.1
index 697125cc040..ba95e761270 100644
--- a/usr.bin/basename/basename.1
+++ b/usr.bin/basename/basename.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)basename.1	8.2 (Berkeley) 4/18/94
-.\"	$Id: basename.1,v 1.4 1997/02/22 19:54:11 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt BASENAME 1
diff --git a/usr.bin/biff/biff.1 b/usr.bin/biff/biff.1
index c0caf75658e..4b4a2d8a45e 100644
--- a/usr.bin/biff/biff.1
+++ b/usr.bin/biff/biff.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)biff.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: biff.1,v 1.4 1997/02/22 19:54:13 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt BIFF 1
diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c
index 185d6349167..606afa8a919 100644
--- a/usr.bin/biff/biff.c
+++ b/usr.bin/biff/biff.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: biff.c,v 1.4 1997/12/29 00:08:50 alex Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/brandelf/brandelf.1 b/usr.bin/brandelf/brandelf.1
index 0a8099c9252..2c4e8209136 100644
--- a/usr.bin/brandelf/brandelf.1
+++ b/usr.bin/brandelf/brandelf.1
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd February 6, 1997
 .Dt BRANDELF 1
diff --git a/usr.bin/brandelf/brandelf.c b/usr.bin/brandelf/brandelf.c
index 5ad14693a7b..cea64801f59 100644
--- a/usr.bin/brandelf/brandelf.c
+++ b/usr.bin/brandelf/brandelf.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: brandelf.c,v 1.10 1998/04/21 02:44:12 eivind Exp $
+ * $FreeBSD$
  */
 
 #include <elf.h>
diff --git a/usr.bin/c89/c89.1 b/usr.bin/c89/c89.1
index 75b4c770d30..a683df08f43 100644
--- a/usr.bin/c89/c89.1
+++ b/usr.bin/c89/c89.1
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: c89.1,v 1.1.1.1 1997/09/17 20:44:54 joerg Exp $
+.\" $FreeBSD$
 .\" "
 .Dd September 17, 1997
 .Os
diff --git a/usr.bin/c89/c89.sh b/usr.bin/c89/c89.sh
index a9ad3d0c35d..157fbbff884 100755
--- a/usr.bin/c89/c89.sh
+++ b/usr.bin/c89/c89.sh
@@ -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: c89.sh,v 1.2 1997/09/18 20:55:50 joerg Exp $
+# $FreeBSD$
 #
 # This is the Posix.2 mandated C compiler.  Basically, a hook to the
 # cc(1) command.
diff --git a/usr.bin/calendar/calendar.1 b/usr.bin/calendar/calendar.1
index 1f2e5417c1b..cfe76c4ab78 100644
--- a/usr.bin/calendar/calendar.1
+++ b/usr.bin/calendar/calendar.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)calendar.1  8.1 (Berkeley) 6/29/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 29, 1993
 .Dt CALENDAR 1
diff --git a/usr.bin/calendar/calendars/calendar.all b/usr.bin/calendar/calendars/calendar.all
index 35a40cc1ce7..652829ef863 100644
--- a/usr.bin/calendar/calendars/calendar.all
+++ b/usr.bin/calendar/calendars/calendar.all
@@ -1,7 +1,7 @@
 /*
  * International and national calendar files
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _calendar_all_
diff --git a/usr.bin/calendar/calendars/calendar.birthday b/usr.bin/calendar/calendars/calendar.birthday
index 10ea34328ca..06a30c0d526 100644
--- a/usr.bin/calendar/calendars/calendar.birthday
+++ b/usr.bin/calendar/calendars/calendar.birthday
@@ -1,7 +1,7 @@
 /*
  * Birthday
  *
- * $Id: calendar.birthday,v 1.9 1998/10/22 07:56:22 torstenb Exp $
+ * $FreeBSD$
  */
 
 #ifndef _calendar_birthday_
diff --git a/usr.bin/calendar/calendars/calendar.christian b/usr.bin/calendar/calendars/calendar.christian
index e238918a00c..d7562f74176 100644
--- a/usr.bin/calendar/calendars/calendar.christian
+++ b/usr.bin/calendar/calendars/calendar.christian
@@ -1,7 +1,7 @@
 /*
  * Christian
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _calendar_christian_
diff --git a/usr.bin/calendar/calendars/calendar.computer b/usr.bin/calendar/calendars/calendar.computer
index 55fb081f6a8..0b45111acde 100644
--- a/usr.bin/calendar/calendars/calendar.computer
+++ b/usr.bin/calendar/calendars/calendar.computer
@@ -1,7 +1,7 @@
 /*
  * Computer
  *
- * $Id: calendar.computer,v 1.4 1997/02/22 19:28:19 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _calendar_computer_
diff --git a/usr.bin/calendar/calendars/calendar.croatian b/usr.bin/calendar/calendars/calendar.croatian
index 187a0c7cc2d..af9a5585438 100644
--- a/usr.bin/calendar/calendars/calendar.croatian
+++ b/usr.bin/calendar/calendars/calendar.croatian
@@ -1,7 +1,7 @@
 /*
  * Croatian calendar files
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _calendar_croatian_
diff --git a/usr.bin/calendar/calendars/calendar.german b/usr.bin/calendar/calendars/calendar.german
index 7ee93eb0b9b..d22207cfd50 100644
--- a/usr.bin/calendar/calendars/calendar.german
+++ b/usr.bin/calendar/calendars/calendar.german
@@ -1,7 +1,7 @@
 /*
  * German calendar file(s)
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _calendar_german_
diff --git a/usr.bin/calendar/calendars/calendar.history b/usr.bin/calendar/calendars/calendar.history
index 1755bedb07d..ba83c637e4c 100644
--- a/usr.bin/calendar/calendars/calendar.history
+++ b/usr.bin/calendar/calendars/calendar.history
@@ -1,7 +1,7 @@
 /*
  * History
  *
- * $Id: calendar.history,v 1.7 1997/02/25 01:20:25 mpp Exp $
+ * $FreeBSD$
  */
 
 #ifndef _calendar_history_
diff --git a/usr.bin/calendar/calendars/calendar.holiday b/usr.bin/calendar/calendars/calendar.holiday
index 6da2a1acd7d..0ae713c1523 100644
--- a/usr.bin/calendar/calendars/calendar.holiday
+++ b/usr.bin/calendar/calendars/calendar.holiday
@@ -1,7 +1,7 @@
 /*
  * Holiday
  *
- * $Id: calendar.holiday,v 1.6 1997/02/22 19:28:22 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _calendar_holiday_
diff --git a/usr.bin/calendar/calendars/calendar.judaic b/usr.bin/calendar/calendars/calendar.judaic
index e0dfab22a5d..f1bc9e43e26 100644
--- a/usr.bin/calendar/calendars/calendar.judaic
+++ b/usr.bin/calendar/calendars/calendar.judaic
@@ -1,7 +1,7 @@
 /*
  * Judaic
  *
- * $Id: calendar.judaic,v 1.5 1998/01/19 14:34:53 jgrosch Exp $
+ * $FreeBSD$
  */
 
 #ifndef _calendar_judaic_
diff --git a/usr.bin/calendar/calendars/calendar.music b/usr.bin/calendar/calendars/calendar.music
index 5a60e595d26..99629ce73c8 100644
--- a/usr.bin/calendar/calendars/calendar.music
+++ b/usr.bin/calendar/calendars/calendar.music
@@ -1,7 +1,7 @@
 /*
  * Music
  *
- * $Id: calendar.music,v 1.6 1997/02/22 19:28:23 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _calendar_music_
diff --git a/usr.bin/calendar/calendars/calendar.russian b/usr.bin/calendar/calendars/calendar.russian
index ce192a0b519..e308873676c 100644
--- a/usr.bin/calendar/calendars/calendar.russian
+++ b/usr.bin/calendar/calendars/calendar.russian
@@ -1,7 +1,7 @@
 /*
  * Russian calendar files
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _calendar_russian_
diff --git a/usr.bin/calendar/calendars/calendar.usholiday b/usr.bin/calendar/calendars/calendar.usholiday
index 1d3e45d0b36..712a4b78459 100644
--- a/usr.bin/calendar/calendars/calendar.usholiday
+++ b/usr.bin/calendar/calendars/calendar.usholiday
@@ -1,7 +1,7 @@
 /*
  * USA holiday
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _calendar_usholiday_
diff --git a/usr.bin/calendar/calendars/calendar.world b/usr.bin/calendar/calendars/calendar.world
index 87201392b43..7e2833b3a5f 100644
--- a/usr.bin/calendar/calendars/calendar.world
+++ b/usr.bin/calendar/calendars/calendar.world
@@ -1,7 +1,7 @@
 /*
  * World wide calendar files, except national calendars
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _calendar_world_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.all b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.all
index 72068aa760e..92c0e51ff73 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.all
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.all
@@ -1,7 +1,7 @@
 /*
  * deutscher Kalender
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_all_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.feiertag b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.feiertag
index d723afa2fa2..4969fc7b7d2 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.feiertag
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.feiertag
@@ -1,7 +1,7 @@
 /*
  * Feiertage
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_feiertag_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.geschichte b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.geschichte
index 6a2a25e484c..24d51f61fe5 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.geschichte
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.geschichte
@@ -13,7 +13,7 @@
  * 
  * ISBN 3-924521-59-X
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_geschichte_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.kirche b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.kirche
index efa73245aee..aa4ef195e74 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.kirche
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.kirche
@@ -1,7 +1,7 @@
 /*
  * Kirche in Deutschland
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_kirche_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.literatur b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.literatur
index 865e88e988e..62acab9011a 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.literatur
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.literatur
@@ -1,7 +1,7 @@
 /*
  * Literatur
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_literatur_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.musik b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.musik
index d08fcd77e5d..ad63646271f 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.musik
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.musik
@@ -1,7 +1,7 @@
 /*
  * Musik
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_musik_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.wissenschaft b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.wissenschaft
index 87f9c726d51..175fe0fa420 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.wissenschaft
+++ b/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.wissenschaft
@@ -1,7 +1,7 @@
 /*
  * Wissenschaft
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_wissenschaft_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all
index 72068aa760e..92c0e51ff73 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all
@@ -1,7 +1,7 @@
 /*
  * deutscher Kalender
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_all_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag
index d723afa2fa2..4969fc7b7d2 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag
@@ -1,7 +1,7 @@
 /*
  * Feiertage
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_feiertag_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte
index 6a2a25e484c..24d51f61fe5 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte
@@ -13,7 +13,7 @@
  * 
  * ISBN 3-924521-59-X
  * 
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_geschichte_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche
index efa73245aee..aa4ef195e74 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche
@@ -1,7 +1,7 @@
 /*
  * Kirche in Deutschland
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_kirche_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur
index 865e88e988e..62acab9011a 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur
@@ -1,7 +1,7 @@
 /*
  * Literatur
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_literatur_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik
index d08fcd77e5d..ad63646271f 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik
@@ -1,7 +1,7 @@
 /*
  * Musik
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_musik_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft
index 87f9c726d51..175fe0fa420 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft
@@ -1,7 +1,7 @@
 /*
  * Wissenschaft
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _de_DE_ISO_8859_1_wissenschaft_
diff --git a/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.all b/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.all
index 17285bd2d3f..11be3432438 100644
--- a/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.all
+++ b/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.all
@@ -1,7 +1,7 @@
 /*
  *  hrvatski calendar
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _hr_HR_ISO_8859_2_all
diff --git a/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici b/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici
index c1ecd597217..b78ea99533f 100644
--- a/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici
+++ b/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici
@@ -1,7 +1,7 @@
 /*
  * hrvatski praznici
  *
- * $Id: calendar.praznici,v 1.4 1997/02/22 19:28:33 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _hr_HR_ISO_8859_2_praznici
diff --git a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all
index 17285bd2d3f..11be3432438 100644
--- a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all
+++ b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all
@@ -1,7 +1,7 @@
 /*
  *  hrvatski calendar
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _hr_HR_ISO_8859_2_all
diff --git a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici
index c1ecd597217..b78ea99533f 100644
--- a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici
+++ b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici
@@ -1,7 +1,7 @@
 /*
  * hrvatski praznici
  *
- * $Id: calendar.praznici,v 1.4 1997/02/22 19:28:33 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _hr_HR_ISO_8859_2_praznici
diff --git a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all
index 89548e84c19..fcdc5e7f8f5 100644
--- a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all
+++ b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.all
@@ -1,7 +1,7 @@
 /*
  * òÕÓÓËÉÊ ËÁÌÅÎÄÁÒØ
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_all
diff --git a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common
index 6bd7764fa82..2a45b1d2650 100644
--- a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common
+++ b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common
@@ -1,7 +1,7 @@
 /*
  * òÕÓÓËÉÅ ÐÒÁÚÄÎÉËÉ
  *
- * $Id: calendar.common,v 1.6 1997/05/01 14:39:55 ache Exp $
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_common_
diff --git a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk
index 25c0eef3f57..22de9d3588b 100644
--- a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk
+++ b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.msk
@@ -1,7 +1,7 @@
 /*
  * ðÅÒÅ×ÏÄ ÞÁÓÏ× ÄÌÑ ÍÏÓËÏ×ÓËÏÊ ×ÒÅÍÅÎÎÏÊ ÚÏÎÙ
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_msk_
diff --git a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox
index 51ef35baa73..0105343eae8 100644
--- a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox
+++ b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox
@@ -1,7 +1,7 @@
 /*
  * ðÒÁ×ÏÓÌÁ×ÎÙÅ ÐÒÁÚÄÎÉËÉ
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_orthodox_
diff --git a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan
index 993a32dca5a..c37c993680e 100644
--- a/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan
+++ b/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan
@@ -1,7 +1,7 @@
 /*
  * ñÚÙÞÅÓËÉÅ ÐÒÁÚÄÎÉËÉ
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_pagan_
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all
index 89548e84c19..fcdc5e7f8f5 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all
@@ -1,7 +1,7 @@
 /*
  * òÕÓÓËÉÊ ËÁÌÅÎÄÁÒØ
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_all
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common
index 6bd7764fa82..2a45b1d2650 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common
@@ -1,7 +1,7 @@
 /*
  * òÕÓÓËÉÅ ÐÒÁÚÄÎÉËÉ
  *
- * $Id: calendar.common,v 1.6 1997/05/01 14:39:55 ache Exp $
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_common_
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk
index 25c0eef3f57..22de9d3588b 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk
@@ -1,7 +1,7 @@
 /*
  * ðÅÒÅ×ÏÄ ÞÁÓÏ× ÄÌÑ ÍÏÓËÏ×ÓËÏÊ ×ÒÅÍÅÎÎÏÊ ÚÏÎÙ
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_msk_
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox
index 51ef35baa73..0105343eae8 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox
@@ -1,7 +1,7 @@
 /*
  * ðÒÁ×ÏÓÌÁ×ÎÙÅ ÐÒÁÚÄÎÉËÉ
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_orthodox_
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan
index 993a32dca5a..c37c993680e 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan
@@ -1,7 +1,7 @@
 /*
  * ñÚÙÞÅÓËÉÅ ÐÒÁÚÄÎÉËÉ
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef _ru_SU_KOI8_R_pagan_
diff --git a/usr.bin/calendar/day.c b/usr.bin/calendar/day.c
index d79ff34c855..cdc36789856 100644
--- a/usr.bin/calendar/day.c
+++ b/usr.bin/calendar/day.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: day.c,v 1.11 1997/10/26 12:51:30 wosch Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c
index 7747fa12e16..846b96ed580 100644
--- a/usr.bin/calendar/io.c
+++ b/usr.bin/calendar/io.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: io.c,v 1.10 1997/06/23 06:52:13 charnier Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/calendar/ostern.c b/usr.bin/calendar/ostern.c
index 2527eb0da4b..12bff9f86e9 100644
--- a/usr.bin/calendar/ostern.c
+++ b/usr.bin/calendar/ostern.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * 	$Id$
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/usr.bin/cap_mkdb/cap_mkdb.1 b/usr.bin/cap_mkdb/cap_mkdb.1
index c7e5dec3177..4cd9ab2c979 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.1
+++ b/usr.bin/cap_mkdb/cap_mkdb.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cap_mkdb.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: cap_mkdb.1,v 1.4 1997/02/22 19:54:19 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt CAP_MKDB 1
diff --git a/usr.bin/chat/Makefile b/usr.bin/chat/Makefile
index 1154024e846..2d25d76a12a 100644
--- a/usr.bin/chat/Makefile
+++ b/usr.bin/chat/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.5 1997/08/22 15:42:31 peter Exp $
+# $FreeBSD$
 
 PROG=	chat
 CFLAGS+=-Wall
diff --git a/usr.bin/chat/chat.8 b/usr.bin/chat/chat.8
index 26ef735b53c..efcf1948c09 100644
--- a/usr.bin/chat/chat.8
+++ b/usr.bin/chat/chat.8
@@ -1,6 +1,6 @@
 .\" -*- nroff -*-
 .\" manual page [] for chat 1.8
-.\" $Id: chat.8,v 1.11 1998/06/03 04:21:36 jkoshy Exp $
+.\" $FreeBSD$
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
diff --git a/usr.bin/chat/chat.c b/usr.bin/chat/chat.c
index c25b8cfd877..217dc303767 100644
--- a/usr.bin/chat/chat.c
+++ b/usr.bin/chat/chat.c
@@ -79,7 +79,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: chat.c,v 1.12 1998/06/23 21:58:41 peter Exp $";
+  "$FreeBSD$";
 #endif
 
 #include <stdio.h>
diff --git a/usr.bin/checknr/checknr.1 b/usr.bin/checknr/checknr.1
index 8d2eefafb80..928b905dc54 100644
--- a/usr.bin/checknr/checknr.1
+++ b/usr.bin/checknr/checknr.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)checknr.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt CHECKNR 1
diff --git a/usr.bin/chflags/chflags.1 b/usr.bin/chflags/chflags.1
index 99424f8a437..1af45709cbd 100644
--- a/usr.bin/chflags/chflags.1
+++ b/usr.bin/chflags/chflags.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chflags.1	8.2 (Berkeley) 3/31/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd March 31, 1994
 .Dt CHFLAGS 1
diff --git a/usr.bin/chkey/Makefile b/usr.bin/chkey/Makefile
index 032743af039..c0bbd6aea17 100644
--- a/usr.bin/chkey/Makefile
+++ b/usr.bin/chkey/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1.1.1 1997/05/28 15:54:04 wpaul Exp $
+# $FreeBSD$
 
 PROG=	chkey
 SRCS=	chkey.c update.c generic.c
diff --git a/usr.bin/chkey/chkey.1 b/usr.bin/chkey/chkey.1
index 6aab3000a35..be4668de769 100644
--- a/usr.bin/chkey/chkey.1
+++ b/usr.bin/chkey/chkey.1
@@ -1,6 +1,6 @@
 .\" @(#)chkey.1 1.5 91/03/11 TIRPC 1.0;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .Dd July 5, 1989
 .Dt CHKEY 1
diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index 098bca2a7e3..e0978b655e1 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chpass.1	8.2 (Berkeley) 12/30/93
-.\"     $Id: chpass.1,v 1.15 1999/02/23 02:41:26 ghelmer Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt CHPASS 1
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index 2809f8bef74..77f9f7832f8 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -40,7 +40,7 @@ static const char copyright[] =
 #ifndef lint
 static const char sccsid[] = "From: @(#)chpass.c	8.4 (Berkeley) 4/2/94";
 static const char rcsid[] =
-	"$Id: chpass.c,v 1.14 1997/03/29 04:28:38 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/chpass/edit.c b/usr.bin/chpass/edit.c
index cf4ae4d4029..cfb951302d6 100644
--- a/usr.bin/chpass/edit.c
+++ b/usr.bin/chpass/edit.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: edit.c,v 1.13 1999/02/23 02:41:26 ghelmer Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/chpass/pw_yp.c b/usr.bin/chpass/pw_yp.c
index dbc262bcacd..0877987f88b 100644
--- a/usr.bin/chpass/pw_yp.c
+++ b/usr.bin/chpass/pw_yp.c
@@ -35,7 +35,7 @@
  * Center for Telecommunications Research
  * Columbia University, New York City
  *
- *	$Id: pw_yp.c,v 1.13 1998/10/17 14:08:12 bde Exp $
+ * $FreeBSD$
  */
 
 #ifdef YP
diff --git a/usr.bin/chpass/pw_yp.h b/usr.bin/chpass/pw_yp.h
index 0a1e1c0573d..15f63d03877 100644
--- a/usr.bin/chpass/pw_yp.h
+++ b/usr.bin/chpass/pw_yp.h
@@ -35,7 +35,7 @@
  * Center for Telecommunications Research
  * Columbia University, New York City
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifdef YP
diff --git a/usr.bin/chpass/util.c b/usr.bin/chpass/util.c
index d8917f51bc9..e7dd06b6db8 100644
--- a/usr.bin/chpass/util.c
+++ b/usr.bin/chpass/util.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)util.c	8.4 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: util.c,v 1.6 1998/03/23 07:41:49 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/cksum/cksum.1 b/usr.bin/cksum/cksum.1
index 37a6e2476b7..66a1d18f0c8 100644
--- a/usr.bin/cksum/cksum.1
+++ b/usr.bin/cksum/cksum.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cksum.1	8.2 (Berkeley) 4/28/95
-.\"	$Id: cksum.1,v 1.7 1997/11/09 16:08:11 obrien Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 28, 1995
 .Dt CKSUM 1
diff --git a/usr.bin/cksum/cksum.c b/usr.bin/cksum/cksum.c
index dbe488c956c..01a7165c1d9 100644
--- a/usr.bin/cksum/cksum.c
+++ b/usr.bin/cksum/cksum.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)cksum.c	8.2 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: cksum.c,v 1.8 1997/11/09 05:47:55 obrien Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/cmp/cmp.1 b/usr.bin/cmp/cmp.1
index 005dfd2ebd6..6153e5160cb 100644
--- a/usr.bin/cmp/cmp.1
+++ b/usr.bin/cmp/cmp.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cmp.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: cmp.1,v 1.5 1997/06/26 11:22:10 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt CMP 1
diff --git a/usr.bin/col/col.1 b/usr.bin/col/col.1
index 577998e261f..afd9c277852 100644
--- a/usr.bin/col/col.1
+++ b/usr.bin/col/col.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)col.1	8.1 (Berkeley) 6/29/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 29, 1993
 .Dt COL 1
diff --git a/usr.bin/colcrt/colcrt.1 b/usr.bin/colcrt/colcrt.1
index 7330c088b43..1167e469473 100644
--- a/usr.bin/colcrt/colcrt.1
+++ b/usr.bin/colcrt/colcrt.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)colcrt.1	8.1 (Berkeley) 6/30/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 30, 1993
 .Dt COLCRT 1
diff --git a/usr.bin/colldef/Makefile b/usr.bin/colldef/Makefile
index ccb5e98f452..29b5e108b55 100644
--- a/usr.bin/colldef/Makefile
+++ b/usr.bin/colldef/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.13 1998/05/05 13:16:22 bde Exp $
+# $FreeBSD$
 
 PROG = colldef
 LFLAGS = -8 -i
diff --git a/usr.bin/colldef/colldef.1 b/usr.bin/colldef/colldef.1
index 66bb90f6d53..9f4f78169c7 100644
--- a/usr.bin/colldef/colldef.1
+++ b/usr.bin/colldef/colldef.1
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: colldef.1,v 1.5 1997/06/26 11:25:16 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd January, 27 1995
 .Dt COLLDEF 1
diff --git a/usr.bin/colldef/data/Makefile b/usr.bin/colldef/data/Makefile
index 8bffc4e625a..b828085c3b5 100644
--- a/usr.bin/colldef/data/Makefile
+++ b/usr.bin/colldef/data/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.22 1999/06/05 03:03:57 julian Exp $
+# $FreeBSD$
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
diff --git a/usr.bin/colldef/data/de_DE.DIS_8859-15.src b/usr.bin/colldef/data/de_DE.DIS_8859-15.src
index e952d169902..f5d609346cc 100644
--- a/usr.bin/colldef/data/de_DE.DIS_8859-15.src
+++ b/usr.bin/colldef/data/de_DE.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # German/ISO 8859-1 (backward compatible with ASCII)
 #
-# $Id: de_DE.DIS_8859-15.src,v 1.2 1999/02/12 21:14:41 ache Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 substitute <ss> with "ss"
diff --git a/usr.bin/colldef/data/de_DE.ISO_8859-1.src b/usr.bin/colldef/data/de_DE.ISO_8859-1.src
index f366e97d291..52d155d75a5 100644
--- a/usr.bin/colldef/data/de_DE.ISO_8859-1.src
+++ b/usr.bin/colldef/data/de_DE.ISO_8859-1.src
@@ -1,6 +1,6 @@
 # German/ISO 8859-1 (backward compatible with ASCII)
 #
-# $Id: de_DE.ISO_8859-1.src,v 1.5 1999/02/12 21:14:41 ache Exp $
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 substitute <ss> with "ss"
diff --git a/usr.bin/colldef/data/es_ES.DIS_8859-15.src b/usr.bin/colldef/data/es_ES.DIS_8859-15.src
index d31a73bf037..002b63503d5 100644
--- a/usr.bin/colldef/data/es_ES.DIS_8859-15.src
+++ b/usr.bin/colldef/data/es_ES.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # Espan~ol (backward compatible with ASCII)
 #
-# $Id: es_ES.DIS_8859-15.src,v 1.3 1997/02/22 19:54:35 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/usr.bin/colldef/data/es_ES.ISO_8859-1.src b/usr.bin/colldef/data/es_ES.ISO_8859-1.src
index e088e21b5c4..7c2b21fc595 100644
--- a/usr.bin/colldef/data/es_ES.ISO_8859-1.src
+++ b/usr.bin/colldef/data/es_ES.ISO_8859-1.src
@@ -1,6 +1,6 @@
 # Espan~ol (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 order \
diff --git a/usr.bin/colldef/data/is_IS.DIS_8859-15.src b/usr.bin/colldef/data/is_IS.DIS_8859-15.src
index 605a8433ae1..fe4dd9beae8 100644
--- a/usr.bin/colldef/data/is_IS.DIS_8859-15.src
+++ b/usr.bin/colldef/data/is_IS.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # icelandic (backward compatible with ASCII)
 #
-# $Id: is_IS.DIS_8859-15.src,v 1.4 1997/02/22 19:54:38 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/usr.bin/colldef/data/is_IS.ISO_8859-1.src b/usr.bin/colldef/data/is_IS.ISO_8859-1.src
index 288459c0b3f..50cd9a95ca8 100644
--- a/usr.bin/colldef/data/is_IS.ISO_8859-1.src
+++ b/usr.bin/colldef/data/is_IS.ISO_8859-1.src
@@ -1,6 +1,6 @@
 # icelandic (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 order \
diff --git a/usr.bin/colldef/data/lt_LN.ASCII.src b/usr.bin/colldef/data/lt_LN.ASCII.src
index 525ebb97970..df3c3408876 100644
--- a/usr.bin/colldef/data/lt_LN.ASCII.src
+++ b/usr.bin/colldef/data/lt_LN.ASCII.src
@@ -1,6 +1,6 @@
 # ASCII
 #
-# $Id: lt_LN.ISO_8859-1.src,v 1.8 1997/02/22 19:54:39 peter Exp $
+# $FreeBSD$
 #
 order \
 	\x00;...;\xff
diff --git a/usr.bin/colldef/data/lt_LN.DIS_8859-15.src b/usr.bin/colldef/data/lt_LN.DIS_8859-15.src
index 71de5833870..449ce85e633 100644
--- a/usr.bin/colldef/data/lt_LN.DIS_8859-15.src
+++ b/usr.bin/colldef/data/lt_LN.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # latin1 (backward compatible with ASCII)
 #
-# $Id: lt_LN.DIS_8859-15.src,v 1.8 1997/02/22 19:54:39 peter Exp $
+# $FreeBSD$
 #
 charmap map.DIS_8859-15
 order \
diff --git a/usr.bin/colldef/data/lt_LN.ISO_8859-1.src b/usr.bin/colldef/data/lt_LN.ISO_8859-1.src
index 93a2da01484..99b7d08ddb0 100644
--- a/usr.bin/colldef/data/lt_LN.ISO_8859-1.src
+++ b/usr.bin/colldef/data/lt_LN.ISO_8859-1.src
@@ -1,6 +1,6 @@
 # latin1 (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-1
 order \
diff --git a/usr.bin/colldef/data/lt_LN.ISO_8859-2.src b/usr.bin/colldef/data/lt_LN.ISO_8859-2.src
index 772fe322038..aee3671f096 100644
--- a/usr.bin/colldef/data/lt_LN.ISO_8859-2.src
+++ b/usr.bin/colldef/data/lt_LN.ISO_8859-2.src
@@ -1,6 +1,6 @@
 # latin2 (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.ISO_8859-2
 order \
diff --git a/usr.bin/colldef/data/ru_SU.CP866.src b/usr.bin/colldef/data/ru_SU.CP866.src
index 88ca377082a..2fc2d20835c 100644
--- a/usr.bin/colldef/data/ru_SU.CP866.src
+++ b/usr.bin/colldef/data/ru_SU.CP866.src
@@ -1,6 +1,6 @@
 # CP866 (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.CP866
 order \
diff --git a/usr.bin/colldef/data/ru_SU.KOI8-R.src b/usr.bin/colldef/data/ru_SU.KOI8-R.src
index f6b0a1877be..3a67bc4e39f 100644
--- a/usr.bin/colldef/data/ru_SU.KOI8-R.src
+++ b/usr.bin/colldef/data/ru_SU.KOI8-R.src
@@ -1,6 +1,6 @@
 # koi8-r (backward compatible with ASCII)
 #
-# $Id$
+# $FreeBSD$
 #
 charmap map.KOI8-R
 order \
diff --git a/usr.bin/colldef/parse.y b/usr.bin/colldef/parse.y
index da485dacd98..c4beb8b59b9 100644
--- a/usr.bin/colldef/parse.y
+++ b/usr.bin/colldef/parse.y
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: parse.y,v 1.13 1999/02/12 20:56:49 ache Exp $
+ * $FreeBSD$
  */
 
 #include <err.h>
diff --git a/usr.bin/colldef/scan.l b/usr.bin/colldef/scan.l
index 405068d5a27..d99f001caa1 100644
--- a/usr.bin/colldef/scan.l
+++ b/usr.bin/colldef/scan.l
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: scan.l,v 1.8 1999/02/12 20:39:06 ache Exp $
+ * $FreeBSD$
  */
 
 #include <ctype.h>
diff --git a/usr.bin/colrm/colrm.1 b/usr.bin/colrm/colrm.1
index 3b3266b7fd3..ddc083b3ceb 100644
--- a/usr.bin/colrm/colrm.1
+++ b/usr.bin/colrm/colrm.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)colrm.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt COLRM 1
diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c
index 2c9e0e496e6..b00182d604d 100644
--- a/usr.bin/colrm/colrm.c
+++ b/usr.bin/colrm/colrm.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: colrm.c,v 1.5 1997/12/29 00:08:59 alex Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/column/column.1 b/usr.bin/column/column.1
index 298eed842ec..4b8ec9ba523 100644
--- a/usr.bin/column/column.1
+++ b/usr.bin/column/column.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)column.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Os
diff --git a/usr.bin/comm/comm.1 b/usr.bin/comm/comm.1
index 8876de8df64..7fe49374dd8 100644
--- a/usr.bin/comm/comm.1
+++ b/usr.bin/comm/comm.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)comm.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Os
diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c
index 70e7c0d0161..25e0f2f7743 100644
--- a/usr.bin/comm/comm.c
+++ b/usr.bin/comm/comm.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "From: @(#)comm.c	8.4 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: comm.c,v 1.4 1997/09/07 15:09:17 joerg Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/compile_et/Makefile b/usr.bin/compile_et/Makefile
index 137f88bc719..d8cd73854eb 100644
--- a/usr.bin/compile_et/Makefile
+++ b/usr.bin/compile_et/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.8 1998/03/20 16:21:39 bde Exp $
+# $FreeBSD$
 
 PROG=	compile_et
 SRCS=	compile_et.c error_table.y
diff --git a/usr.bin/compress/compress.1 b/usr.bin/compress/compress.1
index a06c8a0a9a1..075052f06cf 100644
--- a/usr.bin/compress/compress.1
+++ b/usr.bin/compress/compress.1
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)compress.1	8.2 (Berkeley) 4/18/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt COMPRESS 1
diff --git a/usr.bin/compress/zopen.3 b/usr.bin/compress/zopen.3
index 1584edded25..f97ebde61fb 100644
--- a/usr.bin/compress/zopen.3
+++ b/usr.bin/compress/zopen.3
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)zopen.3	8.1 (Berkeley) 6/9/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt ZOPEN 3
diff --git a/usr.bin/compress/zopen.h b/usr.bin/compress/zopen.h
index 322fd2de9a2..1a22de12cab 100644
--- a/usr.bin/compress/zopen.h
+++ b/usr.bin/compress/zopen.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * 	$Id$
+ * $FreeBSD$
  */
 
 #ifndef _ZOPEN_H_
diff --git a/usr.bin/cpp/cpp.sh b/usr.bin/cpp/cpp.sh
index df09d6de30d..19dee9d4d55 100644
--- a/usr.bin/cpp/cpp.sh
+++ b/usr.bin/cpp/cpp.sh
@@ -36,7 +36,7 @@
 # SUCH DAMAGE.
 #
 #	From: @(#)cpp.sh	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 #
 # Transitional front end to CCCP to make it behave like (Reiser) CCP:
 #	specifies -traditional
diff --git a/usr.bin/ctags/C.c b/usr.bin/ctags/C.c
index c030cedb264..55c637e7ddf 100644
--- a/usr.bin/ctags/C.c
+++ b/usr.bin/ctags/C.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)C.c	8.4 (Berkeley) 4/2/94";
 #else
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/ctags/ctags.1 b/usr.bin/ctags/ctags.1
index 49ac4423995..5e841f21b97 100644
--- a/usr.bin/ctags/ctags.1
+++ b/usr.bin/ctags/ctags.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ctags.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt CTAGS 1
diff --git a/usr.bin/cut/cut.1 b/usr.bin/cut/cut.1
index 207165109d2..e0e9a7127d1 100644
--- a/usr.bin/cut/cut.1
+++ b/usr.bin/cut/cut.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cut.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt CUT 1
diff --git a/usr.bin/dig/Makefile b/usr.bin/dig/Makefile
index 8faa06ae332..7b1e7f085c4 100644
--- a/usr.bin/dig/Makefile
+++ b/usr.bin/dig/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 1997/02/22 19:54:49 peter Exp $
+# $FreeBSD$
 
 .include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
 
diff --git a/usr.bin/dnsquery/Makefile b/usr.bin/dnsquery/Makefile
index 2486aded5c4..ac7cc113aaa 100644
--- a/usr.bin/dnsquery/Makefile
+++ b/usr.bin/dnsquery/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 1997/02/22 19:54:50 peter Exp $
+# $FreeBSD$
 
 .include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
 
diff --git a/usr.bin/doscmd/Makefile b/usr.bin/doscmd/Makefile
index e6a364db0fa..d620c8ec348 100644
--- a/usr.bin/doscmd/Makefile
+++ b/usr.bin/doscmd/Makefile
@@ -1,6 +1,6 @@
 # from BSDI Makefile,v 2.6 1996/04/08 20:06:40 bostic Exp
 #
-# $Id: Makefile,v 1.18 1999/03/16 20:57:19 imp Exp $
+# $FreeBSD$
 
 PROG=	doscmd
 SRCS=	AsyncIO.c ParseBuffer.c bios.c callback.c cpu.c dos.c cmos.c config.c \
diff --git a/usr.bin/doscmd/ParseBuffer.c b/usr.bin/doscmd/ParseBuffer.c
index 88c4771ecce..2eeaeed3164 100644
--- a/usr.bin/doscmd/ParseBuffer.c
+++ b/usr.bin/doscmd/ParseBuffer.c
@@ -29,7 +29,7 @@
  *
  *	BSDI ParseBuffer.c,v 2.2 1996/04/08 19:32:15 bostic Exp
  *
- * $Id: ParseBuffer.c,v 1.2 1996/09/22 05:52:53 miff Exp $
+ * $FreeBSD$
  */
 
 #include <stdlib.h>
diff --git a/usr.bin/doscmd/bios.c b/usr.bin/doscmd/bios.c
index ccfdce82638..c6cea9204ff 100644
--- a/usr.bin/doscmd/bios.c
+++ b/usr.bin/doscmd/bios.c
@@ -29,7 +29,7 @@
  *
  *	BSDI bios.c,v 2.3 1996/04/08 19:32:19 bostic Exp
  *
- * $Id: bios.c,v 1.2 1997/08/15 23:41:23 jlemon Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/callback.c b/usr.bin/doscmd/callback.c
index 4b333ecc7c3..890c7142d45 100644
--- a/usr.bin/doscmd/callback.c
+++ b/usr.bin/doscmd/callback.c
@@ -1,6 +1,6 @@
 /* No copyright?!
 **
-** $Id: callback.c,v 1.3 1996/09/24 00:02:25 miff Exp $
+** $FreeBSD$
 */
 
 
diff --git a/usr.bin/doscmd/callback.h b/usr.bin/doscmd/callback.h
index f81127e59f7..d3c656fd7c2 100644
--- a/usr.bin/doscmd/callback.h
+++ b/usr.bin/doscmd/callback.h
@@ -1,7 +1,7 @@
 /* 
 ** No copyright?!
 **
-** $Id: callback.h,v 1.4 1996/09/22 15:42:48 miff Exp $
+** $FreeBSD$
 */
 typedef void		(*callback_t)(regcontext_t *REGS);
 
diff --git a/usr.bin/doscmd/cmos.c b/usr.bin/doscmd/cmos.c
index 115cbc7ccde..1486c6fd348 100644
--- a/usr.bin/doscmd/cmos.c
+++ b/usr.bin/doscmd/cmos.c
@@ -29,7 +29,7 @@
  *
  *	BSDI cmos.c,v 2.3 1996/04/08 19:32:20 bostic Exp
  *
- * $Id: cmos.c,v 1.2 1996/09/18 16:12:24 miff Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/com.h b/usr.bin/doscmd/com.h
index c2857e2a43d..98982a95872 100644
--- a/usr.bin/doscmd/com.h
+++ b/usr.bin/doscmd/com.h
@@ -29,7 +29,7 @@
  *
  *	BSDI com.h,v 2.2 1996/04/08 19:32:21 bostic Exp
  *
- * $Id: com.h,v 1.3 1996/09/22 15:42:48 miff Exp $
+ * $FreeBSD$
  */
 
 /* com.h for doscmd int14.c */
diff --git a/usr.bin/doscmd/config.c b/usr.bin/doscmd/config.c
index 823c00a937f..d20aa1579a1 100644
--- a/usr.bin/doscmd/config.c
+++ b/usr.bin/doscmd/config.c
@@ -29,7 +29,7 @@
  *
  *	BSDI config.c,v 2.2 1996/04/08 19:32:22 bostic Exp
  *
- * $Id: config.c,v 1.1 1997/08/09 01:42:35 dyson Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/usr.bin/doscmd/cpu.c b/usr.bin/doscmd/cpu.c
index bad8725e9bd..c273084547e 100644
--- a/usr.bin/doscmd/cpu.c
+++ b/usr.bin/doscmd/cpu.c
@@ -1,7 +1,7 @@
 /*
 ** No copyright ?!
 **
-** $Id: cpu.c,v 1.5 1996/09/25 11:05:54 miff Exp $
+** $FreeBSD$
 */
 #include "doscmd.h"
 
diff --git a/usr.bin/doscmd/crt0.c b/usr.bin/doscmd/crt0.c
index 9b3779b15af..ec9c706f7f5 100644
--- a/usr.bin/doscmd/crt0.c
+++ b/usr.bin/doscmd/crt0.c
@@ -29,7 +29,7 @@
  *
  *	BSDI crt0.c,v 2.2 1996/04/08 19:32:24 bostic Exp
  *
- * $Id: crt0.c,v 1.2 1996/09/18 16:12:25 miff Exp $
+ * $FreeBSD$
  */
 
 char **environ;
diff --git a/usr.bin/doscmd/cwd.c b/usr.bin/doscmd/cwd.c
index 6a9b60f4a9c..a5d6c88c83f 100644
--- a/usr.bin/doscmd/cwd.c
+++ b/usr.bin/doscmd/cwd.c
@@ -29,7 +29,7 @@
  *
  *	BSDI cwd.c,v 2.2 1996/04/08 19:32:25 bostic Exp
  *
- * $Id: cwd.c,v 1.2 1998/07/01 19:56:13 imp Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/doscmd/cwd.h b/usr.bin/doscmd/cwd.h
index 323512ff9e4..dfe7e4ea448 100644
--- a/usr.bin/doscmd/cwd.h
+++ b/usr.bin/doscmd/cwd.h
@@ -29,7 +29,7 @@
  *
  *	BSDI cwd.h,v 2.2 1996/04/08 19:32:26 bostic Exp
  *
- * $Id: cwd.h,v 1.3 1996/09/23 09:59:23 miff Exp $
+ * $FreeBSD$
  */
 
 static inline u_char *
diff --git a/usr.bin/doscmd/debug.c b/usr.bin/doscmd/debug.c
index e736f8db4c6..dde4fcb72c0 100644
--- a/usr.bin/doscmd/debug.c
+++ b/usr.bin/doscmd/debug.c
@@ -31,7 +31,7 @@
  *
  * from: BSDI doscmd.c,v 2.3 1996/04/08 19:32:30 bostic Exp
  *
- * $Id: debug.c,v 1.5 1996/09/25 00:03:43 miff Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/usr.bin/doscmd/dispatch.h b/usr.bin/doscmd/dispatch.h
index 59620f15931..7506c534220 100644
--- a/usr.bin/doscmd/dispatch.h
+++ b/usr.bin/doscmd/dispatch.h
@@ -23,7 +23,7 @@
 ** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 ** SUCH DAMAGE.
 **
-** $Id: dispatch.h,v 1.3 1996/09/22 05:52:56 miff Exp $
+** $FreeBSD$
 */
 
 /*
diff --git a/usr.bin/doscmd/dos.c b/usr.bin/doscmd/dos.c
index b81330483f1..7b8fa0c9a91 100644
--- a/usr.bin/doscmd/dos.c
+++ b/usr.bin/doscmd/dos.c
@@ -31,7 +31,7 @@
  *
  *	BSDI int21.c,v 2.2 1996/04/08 19:32:51 bostic Exp
  *
- * $Id: dos.c,v 1.4 1998/07/16 23:54:23 imp Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/dos.h b/usr.bin/doscmd/dos.h
index 030438e7e92..1ec83ac7f32 100644
--- a/usr.bin/doscmd/dos.h
+++ b/usr.bin/doscmd/dos.h
@@ -29,7 +29,7 @@
  *
  *	BSDI dos.h,v 2.2 1996/04/08 19:32:28 bostic Exp
  *
- * $Id: dos.h,v 1.7 1996/09/23 09:59:24 miff Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/usr.bin/doscmd/doscmd.1 b/usr.bin/doscmd/doscmd.1
index 08b320c1b9f..4d039a4b0b6 100644
--- a/usr.bin/doscmd/doscmd.1
+++ b/usr.bin/doscmd/doscmd.1
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	BSDI doscmd.1,v 2.3 1996/04/08 19:32:29 bostic Exp
-.\"	$Id: doscmd.1,v 1.9 1999/07/12 20:23:25 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 30, 1995
 .Dt DOSCMD 1
diff --git a/usr.bin/doscmd/doscmd.c b/usr.bin/doscmd/doscmd.c
index 454a38be293..8e8da70f519 100644
--- a/usr.bin/doscmd/doscmd.c
+++ b/usr.bin/doscmd/doscmd.c
@@ -29,7 +29,7 @@
  *
  *	BSDI doscmd.c,v 2.3 1996/04/08 19:32:30 bostic Exp
  *
- * $Id: doscmd.c,v 1.7 1998/07/16 23:54:25 imp Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/doscmd/doscmd.h b/usr.bin/doscmd/doscmd.h
index 224f9efe117..1c960647d6f 100644
--- a/usr.bin/doscmd/doscmd.h
+++ b/usr.bin/doscmd/doscmd.h
@@ -29,7 +29,7 @@
  *
  *	BSDI doscmd.h,v 2.3 1996/04/08 19:32:32 bostic Exp
  *
- * $Id: doscmd.h,v 1.3 1997/09/30 22:03:41 jlemon Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/usr.bin/doscmd/doscmd_loader.c b/usr.bin/doscmd/doscmd_loader.c
index 7032bfb5cf2..d219ad52b46 100644
--- a/usr.bin/doscmd/doscmd_loader.c
+++ b/usr.bin/doscmd/doscmd_loader.c
@@ -29,7 +29,7 @@
  *
  *	BSDI doscmd_loader.c,v 2.3 1996/04/08 19:32:33 bostic Exp
  *
- * $Id: doscmd_loader.c,v 1.2 1996/09/22 05:52:59 miff Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/usr.bin/doscmd/ems.c b/usr.bin/doscmd/ems.c
index 25b68db3269..1b9b0456843 100644
--- a/usr.bin/doscmd/ems.c
+++ b/usr.bin/doscmd/ems.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$
  */
 
 /* 
diff --git a/usr.bin/doscmd/ems.h b/usr.bin/doscmd/ems.h
index 990866cff78..276bddc6bbd 100644
--- a/usr.bin/doscmd/ems.h
+++ b/usr.bin/doscmd/ems.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: ems.h,v 1.1 1997/09/30 22:03:45 jlemon Exp $
+ * $FreeBSD$
  */
 
 #ifndef EMS_H
diff --git a/usr.bin/doscmd/emsdriv.S b/usr.bin/doscmd/emsdriv.S
index ffa2c983921..40c7affd00b 100644
--- a/usr.bin/doscmd/emsdriv.S
+++ b/usr.bin/doscmd/emsdriv.S
@@ -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/usr.bin/doscmd/emuint.c b/usr.bin/doscmd/emuint.c
index 1b2bfdd7329..9c230a3c0da 100644
--- a/usr.bin/doscmd/emuint.c
+++ b/usr.bin/doscmd/emuint.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/usr.bin/doscmd/emuint.h b/usr.bin/doscmd/emuint.h
index d90b60ec36e..d3797687eda 100644
--- a/usr.bin/doscmd/emuint.h
+++ b/usr.bin/doscmd/emuint.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/usr.bin/doscmd/exe.c b/usr.bin/doscmd/exe.c
index 0314a62442e..ce9a8f02d04 100644
--- a/usr.bin/doscmd/exe.c
+++ b/usr.bin/doscmd/exe.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	BSDI exe.c,v 2.2 1996/04/08 19:32:34 bostic Exp
- * $Id: exe.c,v 1.3 1996/09/22 06:26:01 miff Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/usr.bin/doscmd/int.c b/usr.bin/doscmd/int.c
index 2385f5624a1..3b72e24beba 100644
--- a/usr.bin/doscmd/int.c
+++ b/usr.bin/doscmd/int.c
@@ -1,7 +1,7 @@
 /*
 ** No copyright?!
 **
-** $Id: int.c,v 1.4 1997/03/18 02:36:56 msmith Exp $
+** $FreeBSD$
 */
 #include "doscmd.h"
 
diff --git a/usr.bin/doscmd/int10.c b/usr.bin/doscmd/int10.c
index 0f02cbd9403..32bec88c1c5 100644
--- a/usr.bin/doscmd/int10.c
+++ b/usr.bin/doscmd/int10.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int10.c,v 2.3 1996/04/08 19:32:40 bostic Exp
  *
- * $Id: int10.c,v 1.2 1996/09/22 05:53:00 miff Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int13.c b/usr.bin/doscmd/int13.c
index 2e6db4b96ec..84cb13f6eb0 100644
--- a/usr.bin/doscmd/int13.c
+++ b/usr.bin/doscmd/int13.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int13.c,v 2.3 1996/04/08 19:32:43 bostic Exp
  *
- * $Id: int13.c,v 1.1 1997/08/09 01:42:46 dyson Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int14.c b/usr.bin/doscmd/int14.c
index 602bb80b14f..4d367eb7f4a 100644
--- a/usr.bin/doscmd/int14.c
+++ b/usr.bin/doscmd/int14.c
@@ -32,7 +32,7 @@
  *
  *	BSDI int14.c,v 2.2 1996/04/08 19:32:45 bostic Exp
  *
- * $Id: int14.c,v 1.3 1996/09/22 15:42:53 miff Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int16.c b/usr.bin/doscmd/int16.c
index ccf99cd7e45..517e1312c18 100644
--- a/usr.bin/doscmd/int16.c
+++ b/usr.bin/doscmd/int16.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int16.c,v 2.2 1996/04/08 19:32:47 bostic Exp
  *
- * $Id: int16.c,v 1.3 1996/09/22 15:42:54 miff Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int17.c b/usr.bin/doscmd/int17.c
index 88621917a55..d62d6da9b32 100644
--- a/usr.bin/doscmd/int17.c
+++ b/usr.bin/doscmd/int17.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int17.c,v 2.2 1996/04/08 19:32:48 bostic Exp
  *
- * $Id: int17.c,v 1.2 1998/01/22 02:44:54 msmith Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int1a.c b/usr.bin/doscmd/int1a.c
index 7a973307540..ff7df30f837 100644
--- a/usr.bin/doscmd/int1a.c
+++ b/usr.bin/doscmd/int1a.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int1a.c,v 2.2 1996/04/08 19:32:49 bostic Exp
  *
- * $Id: int1a.c,v 1.1 1997/08/09 01:42:49 dyson Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int2f.c b/usr.bin/doscmd/int2f.c
index e8fecb3d953..8bfe3d8db71 100644
--- a/usr.bin/doscmd/int2f.c
+++ b/usr.bin/doscmd/int2f.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int2f.c,v 2.2 1996/04/08 19:32:53 bostic Exp
  *
- * $Id: int2f.c,v 1.1 1997/08/09 01:42:50 dyson Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/intff.c b/usr.bin/doscmd/intff.c
index a32c64698c8..fd167af6cf4 100644
--- a/usr.bin/doscmd/intff.c
+++ b/usr.bin/doscmd/intff.c
@@ -29,7 +29,7 @@
  *
  *	BSDI intff.c,v 2.2 1996/04/08 19:32:56 bostic Exp
  *
- * $Id: intff.c,v 1.4 1998/07/02 05:12:53 imp Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/mem.c b/usr.bin/doscmd/mem.c
index 025d86e37bf..bae413f660f 100644
--- a/usr.bin/doscmd/mem.c
+++ b/usr.bin/doscmd/mem.c
@@ -29,7 +29,7 @@
  *
  *	BSDI mem.c,v 2.2 1996/04/08 19:32:57 bostic Exp
  *
- * $Id: mem.c,v 1.4 1996/09/22 15:42:57 miff Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/usr.bin/doscmd/mouse.c b/usr.bin/doscmd/mouse.c
index 859366705fb..c9a07740a0f 100644
--- a/usr.bin/doscmd/mouse.c
+++ b/usr.bin/doscmd/mouse.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int33.c,v 2.2 1996/04/08 19:32:54 bostic Exp
  *
- * $Id: mouse.c,v 1.3 1996/09/22 15:42:58 miff Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/mouse.h b/usr.bin/doscmd/mouse.h
index e819c50ad90..b77cba48f57 100644
--- a/usr.bin/doscmd/mouse.h
+++ b/usr.bin/doscmd/mouse.h
@@ -29,7 +29,7 @@
  *
  *	BSDI mouse.h,v 2.2 1996/04/08 19:32:58 bostic Exp
  *
- * $Id: mouse.h,v 1.3 1996/09/22 15:42:58 miff Exp $
+ * $FreeBSD$
  */
 
 typedef struct {
diff --git a/usr.bin/doscmd/net.c b/usr.bin/doscmd/net.c
index 464113f62e7..b899d96599a 100644
--- a/usr.bin/doscmd/net.c
+++ b/usr.bin/doscmd/net.c
@@ -1,7 +1,7 @@
 /*
 ** No copyright!
 **
-** $Id: net.c,v 1.3 1996/09/22 15:42:58 miff Exp $
+** $FreeBSD$
 **
 ** NetBIOS etc. hooks.
 */
diff --git a/usr.bin/doscmd/port.c b/usr.bin/doscmd/port.c
index c9a06b29957..eb2158f1e7d 100644
--- a/usr.bin/doscmd/port.c
+++ b/usr.bin/doscmd/port.c
@@ -29,7 +29,7 @@
  *
  *	BSDI port.c,v 2.2 1996/04/08 19:33:03 bostic Exp
  *
- * $Id: port.c,v 1.1 1997/08/09 01:42:54 dyson Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/redir.S b/usr.bin/doscmd/redir.S
index 4cb4e2e86c3..1f40f3cce6e 100644
--- a/usr.bin/doscmd/redir.S
+++ b/usr.bin/doscmd/redir.S
@@ -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/usr.bin/doscmd/register.h b/usr.bin/doscmd/register.h
index 1b6cecc2351..ba0e91e03a9 100644
--- a/usr.bin/doscmd/register.h
+++ b/usr.bin/doscmd/register.h
@@ -23,7 +23,7 @@
 ** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 ** SUCH DAMAGE.
 **
-** $Id: register.h,v 1.4 1997/03/18 02:36:56 msmith Exp $
+** $FreeBSD$
 */
 
 /******************************************************************************
diff --git a/usr.bin/doscmd/setver.c b/usr.bin/doscmd/setver.c
index 2ae35180338..5826567373e 100644
--- a/usr.bin/doscmd/setver.c
+++ b/usr.bin/doscmd/setver.c
@@ -29,7 +29,7 @@
  *
  *	BSDI setver.c,v 2.2 1996/04/08 19:33:04 bostic Exp
  *
- * $Id: setver.c,v 1.2 1996/09/22 05:53:09 miff Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/signal.c b/usr.bin/doscmd/signal.c
index f42e4cd61d5..70415976057 100644
--- a/usr.bin/doscmd/signal.c
+++ b/usr.bin/doscmd/signal.c
@@ -29,7 +29,7 @@
  *
  *	BSDI signal.c,v 2.2 1996/04/08 19:33:06 bostic Exp
  *
- * $Id: signal.c,v 1.2 1998/02/28 16:02:24 jraynard Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/timer.c b/usr.bin/doscmd/timer.c
index afaa69f804d..41b30199585 100644
--- a/usr.bin/doscmd/timer.c
+++ b/usr.bin/doscmd/timer.c
@@ -1,7 +1,7 @@
 /*
 ** No copyright?!
 **
-** $Id: timer.c,v 1.3 1996/09/22 15:42:59 miff Exp $
+** $FreeBSD$
 */
 #include "doscmd.h"
 
diff --git a/usr.bin/doscmd/trace.c b/usr.bin/doscmd/trace.c
index 65a6ae36199..9be758fd7ba 100644
--- a/usr.bin/doscmd/trace.c
+++ b/usr.bin/doscmd/trace.c
@@ -29,7 +29,7 @@
  *
  *	BSDI trace.c,v 2.2 1996/04/08 19:33:07 bostic Exp
  *
- * $Id: trace.c,v 1.3 1996/09/25 00:03:44 miff Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/trap.c b/usr.bin/doscmd/trap.c
index f8107502673..8b41caa4308 100644
--- a/usr.bin/doscmd/trap.c
+++ b/usr.bin/doscmd/trap.c
@@ -29,7 +29,7 @@
  *
  *	BSDI trap.c,v 2.3 1996/04/08 19:33:08 bostic Exp
  *
- * $Id: trap.c,v 1.3 1999/07/06 07:15:10 cracauer Exp $
+ * $FreeBSD$
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/trap.h b/usr.bin/doscmd/trap.h
index 2aa4e9dfa20..6cba0df95c3 100644
--- a/usr.bin/doscmd/trap.h
+++ b/usr.bin/doscmd/trap.h
@@ -29,7 +29,7 @@
  *
  *	BSDI trap.h,v 2.2 1996/04/08 19:33:09 bostic Exp
  *
- * $Id: trap.h,v 1.2 1996/09/22 05:53:11 miff Exp $
+ * $FreeBSD$
  */
 
 #define	CLI	0xfa
diff --git a/usr.bin/doscmd/tty.c b/usr.bin/doscmd/tty.c
index ef42817a05f..d18f157095f 100644
--- a/usr.bin/doscmd/tty.c
+++ b/usr.bin/doscmd/tty.c
@@ -29,7 +29,7 @@
  *
  *	BSDI tty.c,v 2.4 1996/04/08 22:03:27 prb Exp
  *
- * $Id: tty.c,v 1.4 1998/02/22 23:36:54 msmith Exp $
+ * $FreeBSD$
  */
 
 #ifndef NO_X
diff --git a/usr.bin/doscmd/video.h b/usr.bin/doscmd/video.h
index 2ddded173c5..7b36eb78205 100644
--- a/usr.bin/doscmd/video.h
+++ b/usr.bin/doscmd/video.h
@@ -29,7 +29,7 @@
  *
  *	BSDI video.h,v 2.2 1996/04/08 19:33:12 bostic Exp
  *
- * $Id: video.h,v 1.2 1996/09/22 05:53:12 miff Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/usr.bin/doscmd/xms.c b/usr.bin/doscmd/xms.c
index b016a0aff87..9dbd4ba71f9 100644
--- a/usr.bin/doscmd/xms.c
+++ b/usr.bin/doscmd/xms.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: xms.c,v 1.3 1997/09/30 22:04:06 jlemon Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/usr.bin/doscmd/xms.h b/usr.bin/doscmd/xms.h
index 14a223f895d..51890282b24 100644
--- a/usr.bin/doscmd/xms.h
+++ b/usr.bin/doscmd/xms.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 XMS_H
diff --git a/usr.bin/du/du.1 b/usr.bin/du/du.1
index 8a36cda3c01..08b1ab456c3 100644
--- a/usr.bin/du/du.1
+++ b/usr.bin/du/du.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)du.1	8.2 (Berkeley) 4/1/94
-.\"	$Id: du.1,v 1.10 1997/12/29 20:56:21 jkh Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 1, 1994
 .Dt DU 1
diff --git a/usr.bin/ee/ee.1 b/usr.bin/ee/ee.1
index 6d4ef415f85..2571b6fa77f 100644
--- a/usr.bin/ee/ee.1
+++ b/usr.bin/ee/ee.1
@@ -1,5 +1,5 @@
 .\"
-.\"  $Id$
+.\" $FreeBSD$
 .\"
 .Dd August 30, 1995
 .Dt EE 1
diff --git a/usr.bin/ee/ee.c b/usr.bin/ee/ee.c
index bb38c7007d1..c44ec0057cf 100644
--- a/usr.bin/ee/ee.c
+++ b/usr.bin/ee/ee.c
@@ -52,7 +52,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: ee.c,v 1.11 1998/10/01 21:18:18 obrien Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 char *ee_copyright_message = 
@@ -64,7 +64,7 @@ char *ee_long_notice[] = {
 	"copyright.  All rights are reserved."
 	};
 
-char *version = "@(#) ee, version 1.3  $Revision: 1.11 $";
+char *version = "@(#) ee, version 1.3  $Revision: 1.12 $";
 
 #ifdef NCURSE
 #include "new_curse.h"
diff --git a/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg b/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg
index 21055c2f038..ef2ce2230d3 100644
--- a/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg
+++ b/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $ 
-$ $Id$
+$ $FreeBSD$
 $ 
 $set 1
 $quote "
diff --git a/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg b/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg
index 21055c2f038..ef2ce2230d3 100644
--- a/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg
+++ b/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $ 
-$ $Id$
+$ $FreeBSD$
 $ 
 $set 1
 $quote "
diff --git a/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg b/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg
index 6a5fad2b324..0a383ad0cfe 100644
--- a/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg
+++ b/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $ 
-$ $Id$
+$ $FreeBSD$
 $ 
 $set 1
 $quote "
diff --git a/usr.bin/ee/nls/en_US.US-ASCII/ee.msg b/usr.bin/ee/nls/en_US.US-ASCII/ee.msg
index 6a5fad2b324..0a383ad0cfe 100644
--- a/usr.bin/ee/nls/en_US.US-ASCII/ee.msg
+++ b/usr.bin/ee/nls/en_US.US-ASCII/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $ 
-$ $Id$
+$ $FreeBSD$
 $ 
 $set 1
 $quote "
diff --git a/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg b/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg
index 10c3255c5df..e4c2c9567b3 100644
--- a/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg
+++ b/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $
-$ $Id: ee.msg,v 1.7 1998/01/12 07:53:05 charnier Exp $
+$ $FreeBSD$
 $ 
 $set 1
 $quote "
diff --git a/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg b/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg
index 10c3255c5df..e4c2c9567b3 100644
--- a/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg
+++ b/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $
-$ $Id: ee.msg,v 1.7 1998/01/12 07:53:05 charnier Exp $
+$ $FreeBSD$
 $ 
 $set 1
 $quote "
diff --git a/usr.bin/enigma/enigma.1 b/usr.bin/enigma/enigma.1
index 61a4c2689a9..aa025e2028a 100644
--- a/usr.bin/enigma/enigma.1
+++ b/usr.bin/enigma/enigma.1
@@ -4,7 +4,7 @@
 .\" Since enigma itself is distributed in the Public Domain, this file
 .\" is also.
 .\"
-.\" $Id: enigma.1,v 1.3 1999/06/24 06:22:20 mpp Exp $
+.\" $FreeBSD$
 .\" "
 .Dd October 30, 1998
 .Os
diff --git a/usr.bin/error/error.1 b/usr.bin/error/error.1
index 7f5f79c8b22..b944ee6a222 100644
--- a/usr.bin/error/error.1
+++ b/usr.bin/error/error.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)error.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt ERROR 1
diff --git a/usr.bin/error/filter.c b/usr.bin/error/filter.c
index 1b82cfdf5ee..84fd970572a 100644
--- a/usr.bin/error/filter.c
+++ b/usr.bin/error/filter.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)filter.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: filter.c,v 1.2 1997/11/03 07:44:06 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/error/input.c b/usr.bin/error/input.c
index 97b9667cfdd..602fed616ae 100644
--- a/usr.bin/error/input.c
+++ b/usr.bin/error/input.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)input.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/error/main.c b/usr.bin/error/main.c
index 7ae8100dbd7..7e8b9d587f5 100644
--- a/usr.bin/error/main.c
+++ b/usr.bin/error/main.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.3 1997/11/03 07:44:12 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/error/pi.c b/usr.bin/error/pi.c
index c5c1ffb9145..405f548e4b0 100644
--- a/usr.bin/error/pi.c
+++ b/usr.bin/error/pi.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)pi.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: pi.c,v 1.3 1997/11/03 07:44:15 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/error/subr.c b/usr.bin/error/subr.c
index 9a44019ba76..cd0846392ca 100644
--- a/usr.bin/error/subr.c
+++ b/usr.bin/error/subr.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)subr.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/error/touch.c b/usr.bin/error/touch.c
index 08952f7b593..de6a396ebd3 100644
--- a/usr.bin/error/touch.c
+++ b/usr.bin/error/touch.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)touch.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: touch.c,v 1.5 1998/02/25 02:24:04 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/expand/expand.1 b/usr.bin/expand/expand.1
index 4b7014669d6..6c4aebc604b 100644
--- a/usr.bin/expand/expand.1
+++ b/usr.bin/expand/expand.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)expand.1	8.1 (Berkeley) 6/9/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt EXPAND 1
diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c
index a8014f9a44a..f16f6458275 100644
--- a/usr.bin/expand/expand.c
+++ b/usr.bin/expand/expand.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)expand.c	8.1 (Berkeley) 6/9/93";
 #else
 static const char rcsid[] = 
-	"$Id: expand.c,v 1.3 1998/02/02 07:10:59 cwt Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/false/false.1 b/usr.bin/false/false.1
index 13989ef97dd..28339d3b761 100644
--- a/usr.bin/false/false.1
+++ b/usr.bin/false/false.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)false.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt FALSE 1
diff --git a/usr.bin/fetch/fetch.1 b/usr.bin/fetch/fetch.1
index fd6e78bd621..40b6835eaa2 100644
--- a/usr.bin/fetch/fetch.1
+++ b/usr.bin/fetch/fetch.1
@@ -1,4 +1,4 @@
-.\" $Id: fetch.1,v 1.29 1999/02/23 18:51:13 wollman Exp $
+.\" $FreeBSD$
 .Dd February 22, 1999
 .Dt FETCH 1
 .Os FreeBSD 4.0
diff --git a/usr.bin/fetch/fetch.h b/usr.bin/fetch/fetch.h
index 685fdd67304..bea7db93a38 100644
--- a/usr.bin/fetch/fetch.h
+++ b/usr.bin/fetch/fetch.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: fetch.h,v 1.6 1998/09/20 00:01:26 jkh Exp $
+ * $FreeBSD$
  */
 
 #ifndef fetch_h
diff --git a/usr.bin/fetch/file.c b/usr.bin/fetch/file.c
index 1bdccc8fdc4..24dfd75ab4c 100644
--- a/usr.bin/fetch/file.c
+++ b/usr.bin/fetch/file.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: file.c,v 1.4 1998/09/17 00:15:15 des Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/fetch/ftp.c b/usr.bin/fetch/ftp.c
index f2f2640e563..922887bb278 100644
--- a/usr.bin/fetch/ftp.c
+++ b/usr.bin/fetch/ftp.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ftp.c,v 1.13 1999/02/05 01:01:17 fenner Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/fetch/http.c b/usr.bin/fetch/http.c
index 0805e271667..4e19485a9f8 100644
--- a/usr.bin/fetch/http.c
+++ b/usr.bin/fetch/http.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: http.c,v 1.27 1999/05/18 19:37:37 jmg Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/fetch/main.c b/usr.bin/fetch/main.c
index 6524fd666b0..7cae99ba4e0 100644
--- a/usr.bin/fetch/main.c
+++ b/usr.bin/fetch/main.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: main.c,v 1.51 1999/03/08 19:16:14 wollman Exp $ */
+/* $FreeBSD$ */
 
 #include <sys/types.h>
 
diff --git a/usr.bin/fetch/uri.c b/usr.bin/fetch/uri.c
index 95d4c91898b..3aeb0d1c74a 100644
--- a/usr.bin/fetch/uri.c
+++ b/usr.bin/fetch/uri.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/fetch/util.c b/usr.bin/fetch/util.c
index 1a927626e40..bac316d3a50 100644
--- a/usr.bin/fetch/util.c
+++ b/usr.bin/fetch/util.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: util.c,v 1.5 1997/02/11 20:46:06 wollman Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/file/LEGAL.NOTICE b/usr.bin/file/LEGAL.NOTICE
index 122c5f61562..29f21aed456 100644
--- a/usr.bin/file/LEGAL.NOTICE
+++ b/usr.bin/file/LEGAL.NOTICE
@@ -1,6 +1,6 @@
 Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995.
 Software written by Ian F. Darwin and others; maintained by Christos Zoulas.
-$Id$
+$FreeBSD$
 
 This software (or derivative software) may not be made subject to any 
 license which denies anyone permission to alter it and redistribute it 
diff --git a/usr.bin/file/MAINT b/usr.bin/file/MAINT
index 2b91576c9de..cb318445c60 100644
--- a/usr.bin/file/MAINT
+++ b/usr.bin/file/MAINT
@@ -1,4 +1,4 @@
-$Id$
+$FreeBSD$
 
 Maintenance notes:
 
diff --git a/usr.bin/file/Magdir/Localstuff b/usr.bin/file/Magdir/Localstuff
index 0b6d9554bb9..a3e1e0bfce4 100644
--- a/usr.bin/file/Magdir/Localstuff
+++ b/usr.bin/file/Magdir/Localstuff
@@ -2,6 +2,6 @@
 #------------------------------------------------------------------------------
 # Localstuff:  file(1) magic for locally observed files
 #
-# $Id$
+# $FreeBSD$
 # Add any locally observed files here.  Remember:
 # text if readable, executable if runnable binary, data if unreadable.
diff --git a/usr.bin/file/Magdir/softquad b/usr.bin/file/Magdir/softquad
index f570b0974f3..0fd952a2ee4 100644
--- a/usr.bin/file/Magdir/softquad
+++ b/usr.bin/file/Magdir/softquad
@@ -2,7 +2,7 @@
 #------------------------------------------------------------------------------
 # softquad:  file(1) magic for SoftQuad Publishing Software
 #
-# $Id$
+# $FreeBSD$
 # Author/Editor and RulesBuilder
 #
 # XXX - byte order?
diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile
index 2e00f0bc086..3834e4b0b30 100644
--- a/usr.bin/file/Makefile
+++ b/usr.bin/file/Makefile
@@ -1,6 +1,6 @@
 # Makefile for file(1) cmd.
 # Copyright (c) Ian F. Darwin 86/09/01 - see LEGAL.NOTICE.
-# @(#)$Id: Makefile,v 1.11 1997/04/04 02:42:53 mpp Exp $
+# @(#)$FreeBSD$
 #
 # This software is not subject to any license of the American Telephone
 # and Telegraph Company or of the Regents of the University of California.
diff --git a/usr.bin/file/PORTING b/usr.bin/file/PORTING
index 1fa5da16e7c..7e65021d295 100644
--- a/usr.bin/file/PORTING
+++ b/usr.bin/file/PORTING
@@ -1,5 +1,5 @@
 Portability of the new file(1) command.
-@(#) $Id$
+@(#) $FreeBSD$
 
 Read this file only if the program doesn't compile on your system.
 
diff --git a/usr.bin/file/README b/usr.bin/file/README
index 21932922b2b..9872176410b 100644
--- a/usr.bin/file/README
+++ b/usr.bin/file/README
@@ -1,5 +1,5 @@
 ** README for file(1) Command **
-@(#) $Id: README,v 1.1.1.2 1997/03/18 17:58:39 mpp Exp $
+@(#) $FreeBSD$
 
 This is Release 3.x of Ian Darwin's (copyright but distributable)
 file(1) command. This version is the standard "file" command for Linux,
diff --git a/usr.bin/file/apprentice.c b/usr.bin/file/apprentice.c
index 041ead0e717..9c5b94547f5 100644
--- a/usr.bin/file/apprentice.c
+++ b/usr.bin/file/apprentice.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: apprentice.c,v 1.7 1998/01/28 07:36:21 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/file/ascmagic.c b/usr.bin/file/ascmagic.c
index a2b5d761039..bf116999e3d 100644
--- a/usr.bin/file/ascmagic.c
+++ b/usr.bin/file/ascmagic.c
@@ -28,7 +28,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/file/compress.c b/usr.bin/file/compress.c
index fba9c911931..f1e8ae8b251 100644
--- a/usr.bin/file/compress.c
+++ b/usr.bin/file/compress.c
@@ -8,7 +8,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/file/cvsimport.sh b/usr.bin/file/cvsimport.sh
index f9818fa7fb4..0436074fc63 100644
--- a/usr.bin/file/cvsimport.sh
+++ b/usr.bin/file/cvsimport.sh
@@ -3,7 +3,7 @@
 # This shell script can be used in order to handle future imports
 # of newer versions of file(1)
 #
-# $Id: cvsimport.sh,v 1.3 1997/02/22 19:29:10 peter Exp $
+# $FreeBSD$
 if [ $# -ne 2 ] ; then 
 	echo "usage: $0 <major> <minor>" 1>&2
 	exit 1
diff --git a/usr.bin/file/file.1 b/usr.bin/file/file.1
index bb3221faed9..685afc24259 100644
--- a/usr.bin/file/file.1
+++ b/usr.bin/file/file.1
@@ -1,4 +1,4 @@
-.\" $Id: file.1,v 1.11 1998/01/28 07:36:22 charnier Exp $
+.\" $FreeBSD$
 .Dd July 30, 1997
 .Dt FILE 1 "Copyright but distributable"
 .Os
diff --git a/usr.bin/file/file.c b/usr.bin/file/file.c
index 485e398ee21..f420cac9f1c 100644
--- a/usr.bin/file/file.c
+++ b/usr.bin/file/file.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/file/file.h b/usr.bin/file/file.h
index d62942e221c..7d42ad88c71 100644
--- a/usr.bin/file/file.h
+++ b/usr.bin/file/file.h
@@ -1,6 +1,6 @@
 /*
  * file.h - definitions for file(1) program
- * @(#)$Id: file.h,v 1.8 1998/01/28 07:36:23 charnier Exp $
+ * @(#)$FreeBSD$
  *
  * Copyright (c) Ian F. Darwin, 1987.
  * Written by Ian F. Darwin.
diff --git a/usr.bin/file/fsmagic.c b/usr.bin/file/fsmagic.c
index b12a617b23f..b9f690c1054 100644
--- a/usr.bin/file/fsmagic.c
+++ b/usr.bin/file/fsmagic.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: fsmagic.c,v 1.7 1998/01/28 07:36:23 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/file/internat.c b/usr.bin/file/internat.c
index ffb7aa2e21d..f04208e08a0 100644
--- a/usr.bin/file/internat.c
+++ b/usr.bin/file/internat.c
@@ -1,7 +1,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "file.h"
diff --git a/usr.bin/file/is_tar.c b/usr.bin/file/is_tar.c
index 69d822d9bee..362825f3e8d 100644
--- a/usr.bin/file/is_tar.c
+++ b/usr.bin/file/is_tar.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/file/magic.5 b/usr.bin/file/magic.5
index 6355245187b..12923ac0057 100644
--- a/usr.bin/file/magic.5
+++ b/usr.bin/file/magic.5
@@ -1,5 +1,5 @@
 .\"
-.\" @(#)$Id: magic.5,v 1.8 1997/11/04 03:56:56 steve Exp $
+.\" @(#)$FreeBSD$
 .\"
 .\" install as magic.4 on USG, magic.5 on V7 or Berkeley systems.
 .\"
diff --git a/usr.bin/file/names.h b/usr.bin/file/names.h
index 1fed1bfa2a1..1273375f6a4 100644
--- a/usr.bin/file/names.h
+++ b/usr.bin/file/names.h
@@ -10,7 +10,7 @@
  *
  * See LEGAL.NOTICE
  *
- * $Id: names.h,v 1.1.1.3 1997/03/18 17:58:52 mpp Exp $
+ * $FreeBSD$
  */
 
 /* these types are used to index the table 'types': keep em in sync! */
diff --git a/usr.bin/file/patchlevel.h b/usr.bin/file/patchlevel.h
index b6cea964c4b..7fe74e7f1d6 100644
--- a/usr.bin/file/patchlevel.h
+++ b/usr.bin/file/patchlevel.h
@@ -3,7 +3,7 @@
 
 /*
  * Patchlevel file for Ian Darwin's MAGIC command.
- * $Id: patchlevel.h,v 1.7 1997/03/18 19:37:21 mpp Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/usr.bin/file/print.c b/usr.bin/file/print.c
index 5ccf07dc6af..8cd079ad8fc 100644
--- a/usr.bin/file/print.c
+++ b/usr.bin/file/print.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: print.c,v 1.7 1998/01/28 07:36:25 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/file/readelf.c b/usr.bin/file/readelf.c
index fb87af7a63d..5674402a460 100644
--- a/usr.bin/file/readelf.c
+++ b/usr.bin/file/readelf.c
@@ -1,7 +1,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: readelf.c,v 1.4 1998/02/20 04:54:00 jb Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #ifdef BUILTIN_ELF
diff --git a/usr.bin/file/readelf.h b/usr.bin/file/readelf.h
index 853eed600f9..28d44976c24 100644
--- a/usr.bin/file/readelf.h
+++ b/usr.bin/file/readelf.h
@@ -1,6 +1,6 @@
 /*
  * readelf.h 
- * @(#)$Id: readelf.h,v 1.1.1.1 1997/03/18 17:58:55 mpp Exp $
+ * @(#)$FreeBSD$
  *
  * Provide elf data structures for non-elf machines, allowing file
  * non-elf hosts to determine if an elf binary is stripped.
diff --git a/usr.bin/file/softmagic.c b/usr.bin/file/softmagic.c
index 5227acd50d5..c1e79257963 100644
--- a/usr.bin/file/softmagic.c
+++ b/usr.bin/file/softmagic.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/file/tar.h b/usr.bin/file/tar.h
index 6a9e1dd2239..87f0d55f25a 100644
--- a/usr.bin/file/tar.h
+++ b/usr.bin/file/tar.h
@@ -5,7 +5,7 @@
  *
  * Created 25 August 1985 by John Gilmore, ihnp4!hoptoad!gnu.
  *
- * $Id$ # checkin only
+ * $FreeBSD$ # checkin only
  */
 
 /*
diff --git a/usr.bin/file2c/Makefile b/usr.bin/file2c/Makefile
index 28cd21e8343..79fdc9267dc 100644
--- a/usr.bin/file2c/Makefile
+++ b/usr.bin/file2c/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	file2c
 MAN1=	file2c.1
diff --git a/usr.bin/file2c/file2c.1 b/usr.bin/file2c/file2c.1
index ef4e77b489b..0cf0d42826a 100644
--- a/usr.bin/file2c/file2c.1
+++ b/usr.bin/file2c/file2c.1
@@ -5,7 +5,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.  Poul-Henning Kamp
 .\" ---------------------------------------------------------------------------
 .\"
-.\" $Id: file2c.1,v 1.4 1997/06/23 04:51:58 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 28, 1995
 .Dt FILE2C 1
diff --git a/usr.bin/file2c/file2c.c b/usr.bin/file2c/file2c.c
index 232d51b8c65..f946bbd5cc8 100644
--- a/usr.bin/file2c/file2c.c
+++ b/usr.bin/file2c/file2c.c
@@ -6,7 +6,7 @@
  * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
  * ----------------------------------------------------------------------------
  *
- * $Id: file2c.c,v 1.3 1997/02/22 19:55:01 peter Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/usr.bin/find/find.1 b/usr.bin/find/find.1
index a2de73f421e..59e76ef2803 100644
--- a/usr.bin/find/find.1
+++ b/usr.bin/find/find.1
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)find.1	8.7 (Berkeley) 5/9/95
-.\"	$Id: find.1,v 1.19 1999/04/19 08:26:00 jkoshy Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 9, 1995
 .Dt FIND 1
diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c
index 0005cb6a808..c6cb12ef129 100644
--- a/usr.bin/find/option.c
+++ b/usr.bin/find/option.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)option.c	8.2 (Berkeley) 4/16/94";
 */
 static const char rcsid[] =
-	"$Id: option.c,v 1.6 1997/11/28 15:48:08 steve Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/finger/finger.1 b/usr.bin/finger/finger.1
index 1c43820a685..4fa1860ce04 100644
--- a/usr.bin/finger/finger.1
+++ b/usr.bin/finger/finger.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)finger.1	8.3 (Berkeley) 5/5/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd August 1, 1997
 .Dt FINGER 1
diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c
index ec0e6b9889e..77f365a537a 100644
--- a/usr.bin/finger/finger.c
+++ b/usr.bin/finger/finger.c
@@ -55,7 +55,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)finger.c	8.5 (Berkeley) 5/4/95";
 #else
 static const char rcsid[] =
-	"$Id: finger.c,v 1.13 1999/05/08 00:46:04 obrien Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/finger/finger.h b/usr.bin/finger/finger.h
index a3209cba89d..7d4d99f6fb6 100644
--- a/usr.bin/finger/finger.h
+++ b/usr.bin/finger/finger.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)finger.h	8.1 (Berkeley) 6/6/93
- *	$Id$
+ * $FreeBSD$
  */
 
 typedef struct person {
diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c
index 5d8023f721b..3d0a4091c07 100644
--- a/usr.bin/finger/lprint.c
+++ b/usr.bin/finger/lprint.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)lprint.c	8.3 (Berkeley) 4/28/95";
 #else
 static const char rcsid[] =
-	"$Id: lprint.c,v 1.8 1997/07/02 06:34:49 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/finger/net.c b/usr.bin/finger/net.c
index c4698b461c2..2903c063806 100644
--- a/usr.bin/finger/net.c
+++ b/usr.bin/finger/net.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)net.c	8.4 (Berkeley) 4/28/95";
 #else
 static const char rcsid[] =
-	"$Id: net.c,v 1.10 1998/06/09 04:30:40 imp Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/finger/sprint.c b/usr.bin/finger/sprint.c
index 8c38d7c414f..acf9dff350a 100644
--- a/usr.bin/finger/sprint.c
+++ b/usr.bin/finger/sprint.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)sprint.c	8.3 (Berkeley) 4/28/95";
 #else
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c
index e391840cfef..54c68f0f6f9 100644
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/28/95";
 #else
 static const char rcsid[] =
-	"$Id: util.c,v 1.6 1999/08/21 18:25:38 imp Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/fmt/fmt.1 b/usr.bin/fmt/fmt.1
index e7413905239..2760430e554 100644
--- a/usr.bin/fmt/fmt.1
+++ b/usr.bin/fmt/fmt.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fmt.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt FMT 1
diff --git a/usr.bin/fmt/fmt.c b/usr.bin/fmt/fmt.c
index 51cbe5cd1d6..94dd8c6de00 100644
--- a/usr.bin/fmt/fmt.c
+++ b/usr.bin/fmt/fmt.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)fmt.c	8.1 (Berkeley) 7/20/93";
 #else
 static const char rcsid[] =
-	"$Id: fmt.c,v 1.10 1997/08/21 03:41:41 jlemon Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/fold/fold.1 b/usr.bin/fold/fold.1
index 3e020cf1cac..a37121d6c8a 100644
--- a/usr.bin/fold/fold.1
+++ b/usr.bin/fold/fold.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fold.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt FOLD 1
diff --git a/usr.bin/fold/fold.c b/usr.bin/fold/fold.c
index 080c9abfbca..386caaffcea 100644
--- a/usr.bin/fold/fold.c
+++ b/usr.bin/fold/fold.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)fold.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/fpr/fpr.1 b/usr.bin/fpr/fpr.1
index 7e981125884..489885ed773 100644
--- a/usr.bin/fpr/fpr.1
+++ b/usr.bin/fpr/fpr.1
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fpr.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt FPR 1
diff --git a/usr.bin/from/from.1 b/usr.bin/from/from.1
index 553b2268229..0078a9e6b5d 100644
--- a/usr.bin/from/from.1
+++ b/usr.bin/from/from.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)from.1	8.2 (Berkeley) 12/30/93
-.\"	$Id: from.1,v 1.5 1999/07/26 23:12:12 green Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt FROM 1
diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c
index 4daa4c4a3a1..6b3320712f0 100644
--- a/usr.bin/from/from.c
+++ b/usr.bin/from/from.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)from.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: from.c,v 1.6 1999/07/26 23:12:12 green Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/fsplit/fsplit.1 b/usr.bin/fsplit/fsplit.1
index fe4d06b844a..23a3ddfea62 100644
--- a/usr.bin/fsplit/fsplit.1
+++ b/usr.bin/fsplit/fsplit.1
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fsplit.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt FSPLIT 1
diff --git a/usr.bin/fsplit/fsplit.c b/usr.bin/fsplit/fsplit.c
index 03cf08a4650..d80837efb50 100644
--- a/usr.bin/fsplit/fsplit.c
+++ b/usr.bin/fsplit/fsplit.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)fsplit.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: fsplit.c,v 1.3 1997/07/08 11:01:35 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/fstat/Makefile b/usr.bin/fstat/Makefile
index 6ff6ab1224c..8e9e277d38d 100644
--- a/usr.bin/fstat/Makefile
+++ b/usr.bin/fstat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.2 1997/08/22 14:22:31 jmg Exp $
+# $FreeBSD$
 
 PROG=	fstat
 CFLAGS+=-Wall
diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1
index fd005e58066..9354ec12891 100644
--- a/usr.bin/fstat/fstat.1
+++ b/usr.bin/fstat/fstat.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fstat.1	8.3 (Berkeley) 2/25/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd February 25, 1994
 .Dt FSTAT 1
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index 424f1379daa..b8e0c973a47 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)fstat.c	8.3 (Berkeley) 5/2/95";
 #endif
 static const char rcsid[] =
-	"$Id: fstat.c,v 1.16 1998/07/06 21:01:16 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile
index c74e3adfc9b..bbd82e253aa 100644
--- a/usr.bin/ftp/Makefile
+++ b/usr.bin/ftp/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.8 1997/12/13 20:38:12 pst Exp $
+# $FreeBSD$
 #	$NetBSD: Makefile,v 1.15 1997/10/18 15:31:20 lukem Exp $
 #	from: @(#)Makefile	8.2 (Berkeley) 4/3/94
 
diff --git a/usr.bin/ftp/cmds.c b/usr.bin/ftp/cmds.c
index 04b7c43ffbc..acc3c6bde69 100644
--- a/usr.bin/ftp/cmds.c
+++ b/usr.bin/ftp/cmds.c
@@ -1,4 +1,4 @@
-/*	$Id: cmds.c,v 1.14 1998/02/14 15:38:29 steve Exp $	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: cmds.c,v 1.30.2.1 1997/11/18 00:58:26 mellon Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)cmds.c	8.6 (Berkeley) 10/9/94";
 #else
-__RCSID("$Id: cmds.c,v 1.14 1998/02/14 15:38:29 steve Exp $");
+__RCSID("$FreeBSD$");
 __RCSID_SOURCE("$NetBSD: cmds.c,v 1.30.2.1 1997/11/18 00:58:26 mellon Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/cmdtab.c b/usr.bin/ftp/cmdtab.c
index 37920e7d8bc..542d32053d9 100644
--- a/usr.bin/ftp/cmdtab.c
+++ b/usr.bin/ftp/cmdtab.c
@@ -1,4 +1,4 @@
-/*	$Id$	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: cmdtab.c,v 1.17 1997/08/18 10:20:17 lukem Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)cmdtab.c	8.4 (Berkeley) 10/9/94";
 #else
-__RCSID("$Id$");
+__RCSID("$FreeBSD$");
 __RCSID_SOURCE("$NetBSD: cmdtab.c,v 1.17 1997/08/18 10:20:17 lukem Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/complete.c b/usr.bin/ftp/complete.c
index 901a916d7ba..ee0453f61e1 100644
--- a/usr.bin/ftp/complete.c
+++ b/usr.bin/ftp/complete.c
@@ -1,4 +1,4 @@
-/*	$Id$	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: complete.c,v 1.11 1997/09/13 09:05:53 lukem Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$Id$");
+__RCSID("$FreeBSD$");
 __RCSID_SOURCE("$NetBSD: complete.c,v 1.11 1997/09/13 09:05:53 lukem Exp $");
 #endif /* not lint */
 
diff --git a/usr.bin/ftp/domacro.c b/usr.bin/ftp/domacro.c
index c5ddc92061d..907af4583b9 100644
--- a/usr.bin/ftp/domacro.c
+++ b/usr.bin/ftp/domacro.c
@@ -1,4 +1,4 @@
-/*	$Id$	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: domacro.c,v 1.10 1997/07/20 09:45:45 lukem Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)domacro.c	8.3 (Berkeley) 4/2/94";
 #else
-__RCSID("$Id$");
+__RCSID("$FreeBSD$");
 __RCSID_SOURCE("$NetBSD: domacro.c,v 1.10 1997/07/20 09:45:45 lukem Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/extern.h b/usr.bin/ftp/extern.h
index a334c0b6744..a8ac97b8c86 100644
--- a/usr.bin/ftp/extern.h
+++ b/usr.bin/ftp/extern.h
@@ -1,4 +1,4 @@
-/*	$Id: extern.h,v 1.6 1997/12/13 20:38:15 pst Exp $	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: extern.h,v 1.17.2.1 1997/11/18 00:59:50 mellon Exp $	*/
 
 /*-
diff --git a/usr.bin/ftp/fetch.c b/usr.bin/ftp/fetch.c
index a675886ccb7..1d73c0f9655 100644
--- a/usr.bin/ftp/fetch.c
+++ b/usr.bin/ftp/fetch.c
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$Id: fetch.c,v 1.5 1997/12/16 08:58:15 ache Exp $");
+__RCSID("$FreeBSD$");
 __RCSID_SOURCE("$NetBSD: fetch.c,v 1.16.2.1 1997/11/18 01:00:22 mellon Exp $");
 #endif /* not lint */
 
diff --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1
index 05981aec01c..59b371f34b7 100644
--- a/usr.bin/ftp/ftp.1
+++ b/usr.bin/ftp/ftp.1
@@ -1,4 +1,4 @@
-.\" 	$Id: ftp.1,v 1.10 1999/07/01 14:32:07 ru Exp $
+.\" $FreeBSD$
 .\" 	$NetBSD: ftp.1,v 1.21 1997/06/10 21:59:58 lukem Exp $
 .\"
 .\" Copyright (c) 1985, 1989, 1990, 1993
diff --git a/usr.bin/ftp/ftp.c b/usr.bin/ftp/ftp.c
index 154f6942f5d..d2edd014d54 100644
--- a/usr.bin/ftp/ftp.c
+++ b/usr.bin/ftp/ftp.c
@@ -1,4 +1,4 @@
-/*	$Id: ftp.c,v 1.15 1998/12/09 20:49:20 eivind Exp $	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: ftp.c,v 1.29.2.1 1997/11/18 01:01:04 mellon Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)ftp.c	8.6 (Berkeley) 10/27/94";
 #else
-__RCSID("$Id: ftp.c,v 1.15 1998/12/09 20:49:20 eivind Exp $");
+__RCSID("$FreeBSD$");
 __RCSID_SOURCE("$NetBSD: ftp.c,v 1.29.2.1 1997/11/18 01:01:04 mellon Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/ftp_var.h b/usr.bin/ftp/ftp_var.h
index 2a4f2c8615e..d26d22df7f1 100644
--- a/usr.bin/ftp/ftp_var.h
+++ b/usr.bin/ftp/ftp_var.h
@@ -1,4 +1,4 @@
-/*	$Id: ftp_var.h,v 1.6 1997/12/13 20:38:18 pst Exp $	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: ftp_var.h,v 1.20.2.1 1997/11/18 01:01:37 mellon Exp $	*/
 
 /*
diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c
index f8b21d71deb..f2cad20744c 100644
--- a/usr.bin/ftp/main.c
+++ b/usr.bin/ftp/main.c
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.18 1999/06/25 14:11:15 ru Exp $	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: main.c,v 1.26 1997/10/14 16:31:22 christos Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ __COPYRIGHT("@(#) Copyright (c) 1985, 1989, 1993, 1994\n\
 #if 0
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 10/9/94";
 #else
-__RCSID("$Id: main.c,v 1.18 1999/06/25 14:11:15 ru Exp $");
+__RCSID("$FreeBSD$");
 __RCSID_SOURCE("$NetBSD: main.c,v 1.26 1997/10/14 16:31:22 christos Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/pathnames.h b/usr.bin/ftp/pathnames.h
index bc649d68efc..bf71177a33d 100644
--- a/usr.bin/ftp/pathnames.h
+++ b/usr.bin/ftp/pathnames.h
@@ -1,4 +1,4 @@
-/*	$Id: pathnames.h,v 1.2 1997/06/25 08:56:43 msmith Exp $	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: pathnames.h,v 1.7 1997/01/09 20:19:40 tls Exp $	*/
 
 /*
diff --git a/usr.bin/ftp/ruserpass.c b/usr.bin/ftp/ruserpass.c
index c0e7f95cbea..84355d320e1 100644
--- a/usr.bin/ftp/ruserpass.c
+++ b/usr.bin/ftp/ruserpass.c
@@ -1,4 +1,4 @@
-/*	$Id: ruserpass.c,v 1.7 1997/12/13 20:38:20 pst Exp $	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: ruserpass.c,v 1.14.2.1 1997/11/18 01:02:05 mellon Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)ruserpass.c	8.4 (Berkeley) 4/27/95";
 #else
-__RCSID("$Id: ruserpass.c,v 1.7 1997/12/13 20:38:20 pst Exp $");
+__RCSID("$FreeBSD$");
 __RCSID_SOURCE("$NetBSD: ruserpass.c,v 1.14.2.1 1997/11/18 01:02:05 mellon Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/util.c b/usr.bin/ftp/util.c
index 45baf324d70..24024a19342 100644
--- a/usr.bin/ftp/util.c
+++ b/usr.bin/ftp/util.c
@@ -1,4 +1,4 @@
-/*	$Id: util.c,v 1.6 1998/07/19 00:01:24 jmz Exp $	*/
+/* $FreeBSD$	*/
 /*	$NetBSD: util.c,v 1.16.2.1 1997/11/18 01:02:33 mellon Exp $	*/
 
 /*
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$Id: util.c,v 1.6 1998/07/19 00:01:24 jmz Exp $");
+__RCSID("$FreeBSD$");
 __RCSID_SOURCE("$NetBSD: util.c,v 1.16.2.1 1997/11/18 01:02:33 mellon Exp $");
 #endif /* not lint */
 
diff --git a/usr.bin/gcore/aoutcore.c b/usr.bin/gcore/aoutcore.c
index 6d8f9d358cc..6ad9568ede3 100644
--- a/usr.bin/gcore/aoutcore.c
+++ b/usr.bin/gcore/aoutcore.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)gcore.c	8.2 (Berkeley) 9/23/93";
 #endif
 static const char rcsid[] =
-	"$Id: gcore.c,v 1.13 1998/11/01 06:35:36 jdp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/gcore/elfcore.c b/usr.bin/gcore/elfcore.c
index f612232b458..f66e584ac14 100644
--- a/usr.bin/gcore/elfcore.c
+++ b/usr.bin/gcore/elfcore.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: elfcore.c,v 1.2 1998/11/01 06:35:36 jdp Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/usr.bin/gcore/gcore.1 b/usr.bin/gcore/gcore.1
index a4d3e3cb9e8..ed3d0d62813 100644
--- a/usr.bin/gcore/gcore.1
+++ b/usr.bin/gcore/gcore.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)gcore.1	8.2 (Berkeley) 4/18/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt GCORE 1
diff --git a/usr.bin/gcore/gcore.c b/usr.bin/gcore/gcore.c
index 6d8f9d358cc..6ad9568ede3 100644
--- a/usr.bin/gcore/gcore.c
+++ b/usr.bin/gcore/gcore.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)gcore.c	8.2 (Berkeley) 9/23/93";
 #endif
 static const char rcsid[] =
-	"$Id: gcore.c,v 1.13 1998/11/01 06:35:36 jdp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/gcore/md-nop.c b/usr.bin/gcore/md-nop.c
index b7dcdc4a73f..331901c1841 100644
--- a/usr.bin/gcore/md-nop.c
+++ b/usr.bin/gcore/md-nop.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)md-nop.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/gencat/Makefile b/usr.bin/gencat/Makefile
index 44ed94145c3..45af07adf89 100644
--- a/usr.bin/gencat/Makefile
+++ b/usr.bin/gencat/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 1997/02/22 19:55:04 peter Exp $
+# $FreeBSD$
 
 PROG=	gencat
 SRCS=	gencat.c genlib.c
diff --git a/usr.bin/gencat/gencat.1 b/usr.bin/gencat/gencat.1
index c9959e33239..b7936c6ef12 100644
--- a/usr.bin/gencat/gencat.1
+++ b/usr.bin/gencat/gencat.1
@@ -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: gencat.1,v 1.2 1998/11/18 04:30:53 jkoshy Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 11, 1997
 .Dt GENCAT 1
diff --git a/usr.bin/gensetdefs/Makefile b/usr.bin/gensetdefs/Makefile
index 0ea2b678a9f..00dd6aaf7da 100644
--- a/usr.bin/gensetdefs/Makefile
+++ b/usr.bin/gensetdefs/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1999/05/04 20:31:26 ghelmer Exp $
+# $FreeBSD$
 
 PROG=	gensetdefs
 MAN8=	gensetdefs.8
diff --git a/usr.bin/gensetdefs/gensetdefs.8 b/usr.bin/gensetdefs/gensetdefs.8
index ecbfe3a3668..8b0bf59073a 100644
--- a/usr.bin/gensetdefs/gensetdefs.8
+++ b/usr.bin/gensetdefs/gensetdefs.8
@@ -1,5 +1,5 @@
 .\"
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .Dd March 10, 1999
 .Dt GENSETDEFS 8
diff --git a/usr.bin/gensetdefs/gensetdefs.c b/usr.bin/gensetdefs/gensetdefs.c
index 9a35e097ceb..7e36992214f 100644
--- a/usr.bin/gensetdefs/gensetdefs.c
+++ b/usr.bin/gensetdefs/gensetdefs.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/types.h>
diff --git a/usr.bin/global/Makefile b/usr.bin/global/Makefile
index 8676dc3ceaf..a37a2f967cd 100644
--- a/usr.bin/global/Makefile
+++ b/usr.bin/global/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 1997/12/15 02:28:04 skynyrd Exp $
+# $FreeBSD$
 
 SUBDIR= lib global gtags gctags btreeop htags systags
 
diff --git a/usr.bin/global/Makefile.inc b/usr.bin/global/Makefile.inc
index 34657a06430..0e33fa03b8f 100644
--- a/usr.bin/global/Makefile.inc
+++ b/usr.bin/global/Makefile.inc
@@ -1,4 +1,4 @@
-# $Id: Makefile.inc,v 1.5 1999/01/18 07:38:09 simokawa Exp $
+# $FreeBSD$
 
 .if !defined(GLOBAL_MAKEFILE_INC_BEEN_HERE)
 
diff --git a/usr.bin/global/btreeop/Makefile b/usr.bin/global/btreeop/Makefile
index 12f4357e7bb..da762b8ccbb 100644
--- a/usr.bin/global/btreeop/Makefile
+++ b/usr.bin/global/btreeop/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 1997/12/17 15:18:49 cwt Exp $
+# $FreeBSD$
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/btreeop
diff --git a/usr.bin/global/gctags/Makefile b/usr.bin/global/gctags/Makefile
index b66694a58d1..48ae79232d6 100644
--- a/usr.bin/global/gctags/Makefile
+++ b/usr.bin/global/gctags/Makefile
@@ -1,5 +1,5 @@
 
-# $Id: Makefile,v 1.4 1997/12/17 15:18:52 cwt Exp $
+# $FreeBSD$
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/gctags
diff --git a/usr.bin/global/global/Makefile b/usr.bin/global/global/Makefile
index 0deeda46430..61c4d092ab7 100644
--- a/usr.bin/global/global/Makefile
+++ b/usr.bin/global/global/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 1997/12/17 15:18:53 cwt Exp $
+# $FreeBSD$
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/global
diff --git a/usr.bin/global/gtags/Makefile b/usr.bin/global/gtags/Makefile
index 05f506f77ce..ab3fc7624f4 100644
--- a/usr.bin/global/gtags/Makefile
+++ b/usr.bin/global/gtags/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 1997/12/17 15:18:54 cwt Exp $
+# $FreeBSD$
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/gtags
diff --git a/usr.bin/global/htags/Makefile b/usr.bin/global/htags/Makefile
index c842decafa7..197d5bb6ad4 100644
--- a/usr.bin/global/htags/Makefile
+++ b/usr.bin/global/htags/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 1997/12/15 02:28:19 skynyrd Exp $
+# $FreeBSD$
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/htags
diff --git a/usr.bin/global/lib/Makefile b/usr.bin/global/lib/Makefile
index 793f953cb09..ad6b48d8ecd 100644
--- a/usr.bin/global/lib/Makefile
+++ b/usr.bin/global/lib/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 1997/12/21 08:31:50 cwt Exp $
+# $FreeBSD$
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/lib
diff --git a/usr.bin/global/systags/Makefile b/usr.bin/global/systags/Makefile
index c2b06a1d117..ed125c424c6 100644
--- a/usr.bin/global/systags/Makefile
+++ b/usr.bin/global/systags/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 1997/12/15 23:34:57 cwt Exp $
+# $FreeBSD$
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/systags
diff --git a/usr.bin/gprof/arcs.c b/usr.bin/gprof/arcs.c
index 6a7b17ef82b..c6e77103e73 100644
--- a/usr.bin/gprof/arcs.c
+++ b/usr.bin/gprof/arcs.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)arcs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: arcs.c,v 1.4 1997/07/11 06:11:35 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/gprof/gprof.1 b/usr.bin/gprof/gprof.1
index 90b9ec95eef..df83a70025d 100644
--- a/usr.bin/gprof/gprof.1
+++ b/usr.bin/gprof/gprof.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)gprof.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt GPROF 1
diff --git a/usr.bin/gprof/gprof.c b/usr.bin/gprof/gprof.c
index 2b6285184d4..dfb1e2c82a7 100644
--- a/usr.bin/gprof/gprof.c
+++ b/usr.bin/gprof/gprof.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)gprof.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: gprof.c,v 1.9 1999/05/23 00:37:54 jmz Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/gprof/printgprof.c b/usr.bin/gprof/printgprof.c
index 9c122bb19bc..0fb74f44ce9 100644
--- a/usr.bin/gprof/printgprof.c
+++ b/usr.bin/gprof/printgprof.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)printgprof.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/gprof/printlist.c b/usr.bin/gprof/printlist.c
index 15af8e19852..c77b19fa008 100644
--- a/usr.bin/gprof/printlist.c
+++ b/usr.bin/gprof/printlist.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)printlist.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/head/head.1 b/usr.bin/head/head.1
index 2a23d53eeb5..8e333a5d3ab 100644
--- a/usr.bin/head/head.1
+++ b/usr.bin/head/head.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)head.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt HEAD 1
diff --git a/usr.bin/head/head.c b/usr.bin/head/head.c
index fc4bdf61664..e93896bc3ef 100644
--- a/usr.bin/head/head.c
+++ b/usr.bin/head/head.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)head.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: head.c,v 1.8 1997/07/11 06:13:18 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/hexdump/display.c b/usr.bin/hexdump/display.c
index b72da84ce8c..2d3bdcbd964 100644
--- a/usr.bin/hexdump/display.c
+++ b/usr.bin/hexdump/display.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)display.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: display.c,v 1.2 1997/07/10 06:48:12 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/hexdump/hexdump.1 b/usr.bin/hexdump/hexdump.1
index 1fd6d07c14c..a743a5082e2 100644
--- a/usr.bin/hexdump/hexdump.1
+++ b/usr.bin/hexdump/hexdump.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)hexdump.1	8.2 (Berkeley) 4/18/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt HEXDUMP 1
diff --git a/usr.bin/hexdump/hexdump.c b/usr.bin/hexdump/hexdump.c
index 8491c42d0d5..c8ce78de8c3 100644
--- a/usr.bin/hexdump/hexdump.c
+++ b/usr.bin/hexdump/hexdump.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)hexdump.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: hexdump.c,v 1.2 1997/07/10 06:48:16 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/hexdump/hexsyntax.c b/usr.bin/hexdump/hexsyntax.c
index ae21411fa69..f3bf5878daf 100644
--- a/usr.bin/hexdump/hexsyntax.c
+++ b/usr.bin/hexdump/hexsyntax.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)hexsyntax.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/hexdump/od.1 b/usr.bin/hexdump/od.1
index 001b90088c7..87cea73a83a 100644
--- a/usr.bin/hexdump/od.1
+++ b/usr.bin/hexdump/od.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)od.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: od.1,v 1.5 1997/02/22 19:55:07 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 27, 1994
 .Os
diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c
index 7636ab80a43..65a160e6445 100644
--- a/usr.bin/hexdump/odsyntax.c
+++ b/usr.bin/hexdump/odsyntax.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)odsyntax.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: odsyntax.c,v 1.6 1997/11/04 05:33:14 ache Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/hexdump/parse.c b/usr.bin/hexdump/parse.c
index 34a223649e6..d02cd09a018 100644
--- a/usr.bin/hexdump/parse.c
+++ b/usr.bin/hexdump/parse.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: parse.c,v 1.2 1997/07/10 06:48:24 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/host/Makefile b/usr.bin/host/Makefile
index 70a87aa51c5..9f521895dda 100644
--- a/usr.bin/host/Makefile
+++ b/usr.bin/host/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.4 1997/02/22 19:55:08 peter Exp $
+# $FreeBSD$
 
 .include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
 
diff --git a/usr.bin/id/groups.1 b/usr.bin/id/groups.1
index a19c5935bd1..48bbff64d07 100644
--- a/usr.bin/id/groups.1
+++ b/usr.bin/id/groups.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)groups.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt GROUPS 1
diff --git a/usr.bin/id/groups.sh b/usr.bin/id/groups.sh
index 904f200fcac..b6350be8057 100644
--- a/usr.bin/id/groups.sh
+++ b/usr.bin/id/groups.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)groups.sh	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PATH=/bin:/usr/bin; export PATH
 
diff --git a/usr.bin/id/id.1 b/usr.bin/id/id.1
index 56fdcb7c9b5..de43f87ee2c 100644
--- a/usr.bin/id/id.1
+++ b/usr.bin/id/id.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)id.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: id.1,v 1.4 1998/02/28 21:37:54 alex Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt ID 1
diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c
index 2b6c96b407b..c609a0f7c90 100644
--- a/usr.bin/id/id.c
+++ b/usr.bin/id/id.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)id.c	8.2 (Berkeley) 2/16/94";
 #endif
 static const char rcsid[] =
-	"$Id: id.c,v 1.7 1998/08/21 06:47:58 obrien Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/id/whoami.1 b/usr.bin/id/whoami.1
index 125a05ee8d9..16e542e41d8 100644
--- a/usr.bin/id/whoami.1
+++ b/usr.bin/id/whoami.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)whoami.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt WHOAMI 1
diff --git a/usr.bin/id/whoami.sh b/usr.bin/id/whoami.sh
index 1c24bcc7198..9b18bac1995 100644
--- a/usr.bin/id/whoami.sh
+++ b/usr.bin/id/whoami.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)whoami.sh	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PATH=/bin:/usr/bin; export PATH
 
diff --git a/usr.bin/indent/args.c b/usr.bin/indent/args.c
index 376a6030a29..7a646c0fcfd 100644
--- a/usr.bin/indent/args.c
+++ b/usr.bin/indent/args.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)args.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/indent/indent.1 b/usr.bin/indent/indent.1
index 71fb6bc8d03..b7af9b4c2af 100644
--- a/usr.bin/indent/indent.1
+++ b/usr.bin/indent/indent.1
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)indent.1	8.1 (Berkeley) 7/1/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd July 1, 1993
 .Dt INDENT 1
diff --git a/usr.bin/indent/indent.c b/usr.bin/indent/indent.c
index c903d705765..02d34445ee7 100644
--- a/usr.bin/indent/indent.c
+++ b/usr.bin/indent/indent.c
@@ -46,7 +46,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)indent.c	5.17 (Berkeley) 6/7/93";
 #endif
 static const char rcsid[] =
-	"$Id: indent.c,v 1.3 1998/10/18 04:46:24 thepish Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/indent/io.c b/usr.bin/indent/io.c
index 11c9a8d7ad5..596c849d6c3 100644
--- a/usr.bin/indent/io.c
+++ b/usr.bin/indent/io.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)io.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: io.c,v 1.3 1997/07/15 09:50:59 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/ipcrm/Makefile b/usr.bin/ipcrm/Makefile
index 6cc7bda7d56..9c0e45c0702 100644
--- a/usr.bin/ipcrm/Makefile
+++ b/usr.bin/ipcrm/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	ipcrm
 
diff --git a/usr.bin/ipcrm/ipcrm.1 b/usr.bin/ipcrm/ipcrm.1
index 7dd2c830908..78e4054a02f 100644
--- a/usr.bin/ipcrm/ipcrm.1
+++ b/usr.bin/ipcrm/ipcrm.1
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\" 
-.\" $Id: ipcrm.1,v 1.5 1997/07/15 09:54:34 charnier Exp $
+.\" $FreeBSD$
 .\""
 .Dd August 8, 1994
 .Dt IPCRM 1
diff --git a/usr.bin/ipcrm/ipcrm.c b/usr.bin/ipcrm/ipcrm.c
index cca197e0bc8..b52100f632b 100644
--- a/usr.bin/ipcrm/ipcrm.c
+++ b/usr.bin/ipcrm/ipcrm.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/ipcs/Makefile b/usr.bin/ipcs/Makefile
index 5e4afcc5c78..66537107476 100644
--- a/usr.bin/ipcs/Makefile
+++ b/usr.bin/ipcs/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	ipcs
 BINGRP=	kmem
diff --git a/usr.bin/ipcs/ipcs.1 b/usr.bin/ipcs/ipcs.1
index e4d441c4a3f..b52961465f6 100644
--- a/usr.bin/ipcs/ipcs.1
+++ b/usr.bin/ipcs/ipcs.1
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: ipcs.1,v 1.7 1997/07/15 09:55:58 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 18, 1994
 .Dt "IPCS" 1
diff --git a/usr.bin/ipcs/ipcs.c b/usr.bin/ipcs/ipcs.c
index 5eee8b1c502..a752e6cbf36 100644
--- a/usr.bin/ipcs/ipcs.c
+++ b/usr.bin/ipcs/ipcs.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/join/join.1 b/usr.bin/join/join.1
index 7e0b5bd7879..a95454b17b7 100644
--- a/usr.bin/join/join.1
+++ b/usr.bin/join/join.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)join.1	8.3 (Berkeley) 4/28/95
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 28, 1995
 .Dt JOIN 1
diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c
index a0229b538a9..4b4add9bc1d 100644
--- a/usr.bin/join/join.c
+++ b/usr.bin/join/join.c
@@ -46,7 +46,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)join.c	8.6 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: join.c,v 1.8 1997/08/19 15:58:15 jlemon Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/jot/jot.1 b/usr.bin/jot/jot.1
index d0f0ce457fc..d8419c71b0c 100644
--- a/usr.bin/jot/jot.1
+++ b/usr.bin/jot/jot.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)jot.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: jot.1,v 1.5 1999/07/12 20:23:37 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt JOT 1
diff --git a/usr.bin/jot/jot.c b/usr.bin/jot/jot.c
index 7d96f2b22f6..12b5998cac9 100644
--- a/usr.bin/jot/jot.c
+++ b/usr.bin/jot/jot.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)jot.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: jot.c,v 1.10 1999/07/22 17:11:59 sheldonh Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/kdump/kdump.1 b/usr.bin/kdump/kdump.1
index ac47abf887b..b4df3ebb698 100644
--- a/usr.bin/kdump/kdump.1
+++ b/usr.bin/kdump/kdump.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)kdump.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: kdump.1,v 1.3 1997/04/27 08:45:44 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt KDUMP 1
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index c8d46025d59..7fad0f3f7ee 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)kdump.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: kdump.c,v 1.14 1999/06/26 07:31:13 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #define KERNEL
diff --git a/usr.bin/key/key.1 b/usr.bin/key/key.1
index 56a6e1c0838..a20dd419d55 100644
--- a/usr.bin/key/key.1
+++ b/usr.bin/key/key.1
@@ -1,5 +1,5 @@
 .\"	from: @(#)key.1	1.0 (Bellcore) 12/2/91
-.\" $Id: key.1,v 1.3 1997/07/16 06:51:12 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 2, 1991
 .Dt KEY 1
diff --git a/usr.bin/keyinfo/keyinfo.1 b/usr.bin/keyinfo/keyinfo.1
index 5b6a6c5b681..77504373635 100644
--- a/usr.bin/keyinfo/keyinfo.1
+++ b/usr.bin/keyinfo/keyinfo.1
@@ -1,5 +1,5 @@
 .\"	from: @(#)keyinfo.1	1.1 (Bellcore) 7/20/93
-.\"	$Id: keyinfo.1,v 1.5 1997/07/16 06:52:13 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 26, 1996
 .Dt KEYINFO 1
diff --git a/usr.bin/keyinfo/keyinfo.pl b/usr.bin/keyinfo/keyinfo.pl
index 260a72479f9..8316c589650 100644
--- a/usr.bin/keyinfo/keyinfo.pl
+++ b/usr.bin/keyinfo/keyinfo.pl
@@ -3,7 +3,7 @@
 # Search /etc/skeykeys for the skey string for this user OR user specified
 # in 1st parameter.
 #
-# $Id$
+# $FreeBSD$
 #
 
 die "usage: keyinfo [user]\n" unless $#ARGV < 1;
diff --git a/usr.bin/keyinit/keyinit.1 b/usr.bin/keyinit/keyinit.1
index 8513507faef..ee3dba15203 100644
--- a/usr.bin/keyinit/keyinit.1
+++ b/usr.bin/keyinit/keyinit.1
@@ -1,5 +1,5 @@
 .\"	@(#)keyinit.1	1.0 (Bellcore) 7/20/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd July 20, 1993
 .Dt KEYINIT 1
diff --git a/usr.bin/keylogin/Makefile b/usr.bin/keylogin/Makefile
index 1c3b861ab67..bf279eb25b2 100644
--- a/usr.bin/keylogin/Makefile
+++ b/usr.bin/keylogin/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	keylogin
 
diff --git a/usr.bin/keylogin/keylogin.1 b/usr.bin/keylogin/keylogin.1
index e20ddfab469..501d002cffb 100644
--- a/usr.bin/keylogin/keylogin.1
+++ b/usr.bin/keylogin/keylogin.1
@@ -1,6 +1,6 @@
 .\" @(#)keylogin.1 1.5 91/03/11 TIRPC 1.0;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\" $Id$
+.\" $FreeBSD$
 .\"
 .Dd September 9, 1987
 .Dt KEYLOGIN 1
diff --git a/usr.bin/keylogout/Makefile b/usr.bin/keylogout/Makefile
index e3743ad6029..cc433e44466 100644
--- a/usr.bin/keylogout/Makefile
+++ b/usr.bin/keylogout/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	keylogout
 
diff --git a/usr.bin/keylogout/keylogout.1 b/usr.bin/keylogout/keylogout.1
index 373304b2b40..7a3503e55e0 100644
--- a/usr.bin/keylogout/keylogout.1
+++ b/usr.bin/keylogout/keylogout.1
@@ -1,4 +1,4 @@
-.\" $Id$
+.\" $FreeBSD$
 .\" @(#)keylogout.1 1.4 91/03/11 TIRPC 1.0; from 1.3 89/07/26 SMI;
 .Dd April 15, 1989
 .Dt KEYLOGOUT 1
diff --git a/usr.bin/keylogout/keylogout.c b/usr.bin/keylogout/keylogout.c
index 86d391bc707..d5276d2e168 100644
--- a/usr.bin/keylogout/keylogout.c
+++ b/usr.bin/keylogout/keylogout.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/killall/Makefile b/usr.bin/killall/Makefile
index b7b31962739..0a0ced7d0db 100644
--- a/usr.bin/killall/Makefile
+++ b/usr.bin/killall/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 MAINTAINER= wosch
 
 MAN1=	killall.1
diff --git a/usr.bin/killall/killall.1 b/usr.bin/killall/killall.1
index 2e51e058bfb..c7b3c3e0feb 100644
--- a/usr.bin/killall/killall.1
+++ b/usr.bin/killall/killall.1
@@ -22,7 +22,7 @@
 .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: killall.1,v 1.9 1997/11/01 15:06:40 wosch Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 25, 1995
 .Os FreeBSD 2.2 
diff --git a/usr.bin/killall/killall.pl b/usr.bin/killall/killall.pl
index e18489acf70..6238c7b4966 100755
--- a/usr.bin/killall/killall.pl
+++ b/usr.bin/killall/killall.pl
@@ -26,7 +26,7 @@
 #
 # killall - kill processes by name
 #
-# $Id: killall.pl,v 1.10 1998/08/30 16:54:58 wosch Exp $
+# $FreeBSD$
 
 
 $ENV{'PATH'} = '/bin:/usr/bin'; # security
diff --git a/usr.bin/ktrace/Makefile b/usr.bin/ktrace/Makefile
index b551a37d461..c00bb751045 100644
--- a/usr.bin/ktrace/Makefile
+++ b/usr.bin/ktrace/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	1.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.4 1997/02/22 19:55:27 peter Exp $
+# $FreeBSD$
 
 PROG=	ktrace
 SRCS=	ktrace.c subr.c
diff --git a/usr.bin/ktrace/ktrace.1 b/usr.bin/ktrace/ktrace.1
index 6708e3ca7d2..20a461a3941 100644
--- a/usr.bin/ktrace/ktrace.1
+++ b/usr.bin/ktrace/ktrace.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ktrace.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: ktrace.1,v 1.6 1997/04/27 08:45:45 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt KTRACE 1
diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c
index f96c4fd4574..1c5a98ba679 100644
--- a/usr.bin/ktrace/ktrace.c
+++ b/usr.bin/ktrace/ktrace.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)ktrace.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: ktrace.c,v 1.10 1997/03/29 04:30:16 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c
index 8af26bab5cf..4e4b3bf466a 100644
--- a/usr.bin/ktrace/subr.c
+++ b/usr.bin/ktrace/subr.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)subr.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/kzip/Makefile b/usr.bin/kzip/Makefile
index 7c9f8c3b438..8ff6f7f0962 100644
--- a/usr.bin/kzip/Makefile
+++ b/usr.bin/kzip/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	kzip
 MAN8=	kzip.8
diff --git a/usr.bin/kzip/kzip.8 b/usr.bin/kzip/kzip.8
index f720da67fc1..a966d365f31 100644
--- a/usr.bin/kzip/kzip.8
+++ b/usr.bin/kzip/kzip.8
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: kzip.8,v 1.5 1998/03/23 07:44:18 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd August 15, 1996
 .Os
diff --git a/usr.bin/kzip/kzip.c b/usr.bin/kzip/kzip.c
index 74bd701751d..430dcc39f61 100644
--- a/usr.bin/kzip/kzip.c
+++ b/usr.bin/kzip/kzip.c
@@ -13,7 +13,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: kzip.c,v 1.11 1998/06/01 18:34:19 jhay Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/lam/lam.1 b/usr.bin/lam/lam.1
index 78b8ea02523..b1c9ed8aba1 100644
--- a/usr.bin/lam/lam.1
+++ b/usr.bin/lam/lam.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)lam.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt LAM 1
diff --git a/usr.bin/lam/lam.c b/usr.bin/lam/lam.c
index 599337a7185..277081095af 100644
--- a/usr.bin/lam/lam.c
+++ b/usr.bin/lam/lam.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)lam.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/last/last.1 b/usr.bin/last/last.1
index 8983fc19763..27be940c081 100644
--- a/usr.bin/last/last.1
+++ b/usr.bin/last/last.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)last.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt LAST 1
diff --git a/usr.bin/lastcomm/lastcomm.1 b/usr.bin/lastcomm/lastcomm.1
index 7e84c7ded47..33248e24b3c 100644
--- a/usr.bin/lastcomm/lastcomm.1
+++ b/usr.bin/lastcomm/lastcomm.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)lastcomm.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: lastcomm.1,v 1.5 1997/02/22 19:55:32 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 18, 1996
 .Dt LASTCOMM 1
diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c
index 64aae8fa486..4beed143c97 100644
--- a/usr.bin/lastcomm/lastcomm.c
+++ b/usr.bin/lastcomm/lastcomm.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)lastcomm.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ldd/Makefile b/usr.bin/ldd/Makefile
index a3a72694496..d7cd0106968 100644
--- a/usr.bin/ldd/Makefile
+++ b/usr.bin/ldd/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.9 1998/06/12 14:11:15 peter Exp $
+# $FreeBSD$
 
 PROG=		ldd
 SRCS=		ldd.c
diff --git a/usr.bin/ldd/ldd.c b/usr.bin/ldd/ldd.c
index 860b0533629..d565d607102 100644
--- a/usr.bin/ldd/ldd.c
+++ b/usr.bin/ldd/ldd.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: ldd.c,v 1.16 1998/08/30 18:30:59 jdp Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/ldd/sods.c b/usr.bin/ldd/sods.c
index 70784e6258b..a41afaa63c1 100644
--- a/usr.bin/ldd/sods.c
+++ b/usr.bin/ldd/sods.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: sods.c,v 1.7 1998/05/01 08:40:11 dfr Exp $
+ * $FreeBSD$
  */
 
 #include <assert.h>
diff --git a/usr.bin/leave/Makefile b/usr.bin/leave/Makefile
index 4c612917121..eacf6f1e021 100644
--- a/usr.bin/leave/Makefile
+++ b/usr.bin/leave/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $Id$
+# $FreeBSD$
 
 PROG=	leave
 CFLAGS+=-Wall
diff --git a/usr.bin/leave/leave.1 b/usr.bin/leave/leave.1
index 32b1999e76e..f0cc56e726f 100644
--- a/usr.bin/leave/leave.1
+++ b/usr.bin/leave/leave.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)leave.1	8.3 (Berkeley) 4/28/95
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 28, 1995
 .Dt LEAVE 1
diff --git a/usr.bin/leave/leave.c b/usr.bin/leave/leave.c
index c3926969268..d76465531fa 100644
--- a/usr.bin/leave/leave.c
+++ b/usr.bin/leave/leave.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)leave.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: leave.c,v 1.3 1998/01/06 17:27:09 helbig Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile
index 5d98811d484..855da64da49 100644
--- a/usr.bin/lex/Makefile
+++ b/usr.bin/lex/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.11 1997/10/05 09:39:58 jkh Exp $
+# $FreeBSD$
 #
 # By default, flex will be configured to generate 8-bit scanners only if the
 # -8 flag is given.  If you want it to always generate 8-bit scanners, add
diff --git a/usr.bin/lex/lib/Makefile b/usr.bin/lex/lib/Makefile
index 8fd744f3c9e..0091cc2747b 100644
--- a/usr.bin/lex/lib/Makefile
+++ b/usr.bin/lex/lib/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 1997/02/22 19:55:36 peter Exp $
+# $FreeBSD$
 
 LIB=    ln
 SRCS=   libmain.c libyywrap.c
diff --git a/usr.bin/limits/limits.1 b/usr.bin/limits/limits.1
index 29033ea1d77..258dc55b370 100644
--- a/usr.bin/limits/limits.1
+++ b/usr.bin/limits/limits.1
@@ -17,7 +17,7 @@
 .\" 5. Modifications may be freely made to this file providing the above
 .\"    conditions are met.
 .\"
-.\"	$Id: limits.1,v 1.11 1999/04/13 02:32:12 ghelmer Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 15, 1996
 .Dt LIMITS 1
diff --git a/usr.bin/limits/limits.c b/usr.bin/limits/limits.c
index e2f8bef620e..b9de9a4c9cd 100644
--- a/usr.bin/limits/limits.c
+++ b/usr.bin/limits/limits.c
@@ -20,7 +20,7 @@
  *
  * Display/change(+runprogram)/eval resource limits.
  *
- *	$Id: limits.c,v 1.4 1997/05/10 19:00:58 davidn Exp $
+ * $FreeBSD$
  */
 
 #include <err.h>
diff --git a/usr.bin/locate/Makefile b/usr.bin/locate/Makefile
index 2c82bee27aa..1d495e420ec 100644
--- a/usr.bin/locate/Makefile
+++ b/usr.bin/locate/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id: Makefile,v 1.4 1997/02/22 19:55:40 peter Exp $
+# $FreeBSD$
 
 MAINTAINER= wosch
 
diff --git a/usr.bin/locate/Makefile.inc b/usr.bin/locate/Makefile.inc
index 0f80876250b..48174083d84 100644
--- a/usr.bin/locate/Makefile.inc
+++ b/usr.bin/locate/Makefile.inc
@@ -1,3 +1,3 @@
-#	$Id$
+# $FreeBSD$
 
 LIBEXECDIR?=	/usr/libexec
diff --git a/usr.bin/locate/bigram/Makefile b/usr.bin/locate/bigram/Makefile
index bcb016e24a7..e0018d89b7f 100644
--- a/usr.bin/locate/bigram/Makefile
+++ b/usr.bin/locate/bigram/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	locate.bigram
 NOMAN=	noman
diff --git a/usr.bin/locate/bigram/locate.bigram.c b/usr.bin/locate/bigram/locate.bigram.c
index 663428a0526..137b590697a 100644
--- a/usr.bin/locate/bigram/locate.bigram.c
+++ b/usr.bin/locate/bigram/locate.bigram.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * 	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/locate/code/Makefile b/usr.bin/locate/code/Makefile
index 7e4c4fd573f..fb1fb510e59 100644
--- a/usr.bin/locate/code/Makefile
+++ b/usr.bin/locate/code/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	locate.code
 CFLAGS+=-I${.CURDIR}/../locate 
diff --git a/usr.bin/locate/code/locate.code.c b/usr.bin/locate/code/locate.code.c
index 47d20590dba..c7cb09715fb 100644
--- a/usr.bin/locate/code/locate.code.c
+++ b/usr.bin/locate/code/locate.code.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * 	$Id: locate.code.c,v 1.9 1997/02/22 19:55:43 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/locate/locate/Makefile b/usr.bin/locate/locate/Makefile
index c1b14bf657e..064cf08a52b 100644
--- a/usr.bin/locate/locate/Makefile
+++ b/usr.bin/locate/locate/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	locate
 SRCS=	util.c locate.c
diff --git a/usr.bin/locate/locate/concatdb.sh b/usr.bin/locate/locate/concatdb.sh
index 86251a33ca7..75c683246ca 100644
--- a/usr.bin/locate/locate/concatdb.sh
+++ b/usr.bin/locate/locate/concatdb.sh
@@ -30,7 +30,7 @@
 #
 # Sequence of databases is important.
 #
-# $Id: concatdb.sh,v 1.7 1998/03/08 15:28:32 wosch Exp $
+# $FreeBSD$
 
 # The directory containing locate subprograms
 : ${LIBEXECDIR:=/usr/libexec}; export LIBEXECDIR
diff --git a/usr.bin/locate/locate/fastfind.c b/usr.bin/locate/locate/fastfind.c
index d886ffa5566..68f8a86d2b2 100644
--- a/usr.bin/locate/locate/fastfind.c
+++ b/usr.bin/locate/locate/fastfind.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: fastfind.c,v 1.10 1997/07/21 12:08:13 charnier Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/usr.bin/locate/locate/locate.1 b/usr.bin/locate/locate/locate.1
index 2519a0722c7..e4cffa873aa 100644
--- a/usr.bin/locate/locate/locate.1
+++ b/usr.bin/locate/locate/locate.1
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)locate.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: locate.1,v 1.10 1998/02/07 05:30:14 alex Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt LOCATE 1
diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c
index 819d8a50c92..a0ffe0dbdcc 100644
--- a/usr.bin/locate/locate/locate.c
+++ b/usr.bin/locate/locate/locate.c
@@ -47,7 +47,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)locate.c    8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/locate/locate/locate.h b/usr.bin/locate/locate/locate.h
index 9e997d44723..24df8d4002b 100644
--- a/usr.bin/locate/locate/locate.h
+++ b/usr.bin/locate/locate/locate.h
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)locate.h	8.1 (Berkeley) 6/6/93
- *	$Id$
+ * $FreeBSD$
  */
 
 /* Symbolic constants shared by locate.c and code.c */
diff --git a/usr.bin/locate/locate/locate.rc b/usr.bin/locate/locate/locate.rc
index e1f400083ba..57835b363a3 100644
--- a/usr.bin/locate/locate/locate.rc
+++ b/usr.bin/locate/locate/locate.rc
@@ -1,7 +1,7 @@
 #
 # /etc/locate.rc -  command script for updatedb(8)
 #
-# $Id: locate.rc,v 1.6 1998/03/08 16:09:26 wosch Exp $
+# $FreeBSD$
 
 #
 # All commented values are the defaults
diff --git a/usr.bin/locate/locate/locate.updatedb.8 b/usr.bin/locate/locate/locate.updatedb.8
index 9e9bb1e8c1a..fad70894c05 100644
--- a/usr.bin/locate/locate/locate.updatedb.8
+++ b/usr.bin/locate/locate/locate.updatedb.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd February 11, 1996
 .Dt LOCATE.UPDATEDB 8
diff --git a/usr.bin/locate/locate/mklocatedb.sh b/usr.bin/locate/locate/mklocatedb.sh
index 864760e87ec..4df3afa1386 100644
--- a/usr.bin/locate/locate/mklocatedb.sh
+++ b/usr.bin/locate/locate/mklocatedb.sh
@@ -28,7 +28,7 @@
 # 
 # usage: mklocatedb [-presort] < filelist > database
 #
-# $Id: mklocatedb.sh,v 1.7 1998/03/08 16:09:28 wosch Exp $
+# $FreeBSD$
 
 # The directory containing locate subprograms
 : ${LIBEXECDIR:=/usr/libexec}; export LIBEXECDIR
diff --git a/usr.bin/locate/locate/updatedb.sh b/usr.bin/locate/locate/updatedb.sh
index 0eea10e3c2b..fbf1e61b0a4 100644
--- a/usr.bin/locate/locate/updatedb.sh
+++ b/usr.bin/locate/locate/updatedb.sh
@@ -26,7 +26,7 @@
 #
 # updatedb - update locate database for local mounted filesystems
 #
-# $Id: updatedb.sh,v 1.14 1999/05/14 10:18:43 wosch Exp $
+# $FreeBSD$
 
 : ${LOCATE_CONFIG="/etc/locate.rc"}
 if [ -f "$LOCATE_CONFIG" -a -r "$LOCATE_CONFIG" ]; then
diff --git a/usr.bin/locate/locate/util.c b/usr.bin/locate/locate/util.c
index 87ad02f1057..38fe284a80f 100644
--- a/usr.bin/locate/locate/util.c
+++ b/usr.bin/locate/locate/util.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: util.c,v 1.4 1997/02/22 19:55:50 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/usr.bin/lock/lock.1 b/usr.bin/lock/lock.1
index 8f707777f50..d3538ed2fe0 100644
--- a/usr.bin/lock/lock.1
+++ b/usr.bin/lock/lock.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)lock.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt LOCK 1
diff --git a/usr.bin/lock/lock.c b/usr.bin/lock/lock.c
index 786c31ac762..d5b60ae10da 100644
--- a/usr.bin/lock/lock.c
+++ b/usr.bin/lock/lock.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)lock.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: lock.c,v 1.4 1997/07/21 12:09:34 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/lockf/Makefile b/usr.bin/lockf/Makefile
index 47fb6ab863e..77d89c45bbd 100644
--- a/usr.bin/lockf/Makefile
+++ b/usr.bin/lockf/Makefile
@@ -1,4 +1,4 @@
-# $Id$
+# $FreeBSD$
 
 PROG=	lockf
 CFLAGS+=-Wall
diff --git a/usr.bin/lockf/lockf.1 b/usr.bin/lockf/lockf.1
index 36b50de0cc8..e4fc80eb93d 100644
--- a/usr.bin/lockf/lockf.1
+++ b/usr.bin/lockf/lockf.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: lockf.1,v 1.5 1998/03/23 07:44:28 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 7, 1998
 .Os FreeBSD
diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c
index 76b4870634d..0a91048cafc 100644
--- a/usr.bin/lockf/lockf.c
+++ b/usr.bin/lockf/lockf.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: lockf.c,v 1.6 1997/07/22 07:32:23 charnier Exp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/logger/logger.1 b/usr.bin/logger/logger.1
index 413b39af49b..b2abd2ba2de 100644
--- a/usr.bin/logger/logger.1
+++ b/usr.bin/logger/logger.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)logger.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt LOGGER 1
diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c
index c272ae26930..e7be7712550 100644
--- a/usr.bin/logger/logger.c
+++ b/usr.bin/logger/logger.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)logger.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index 595a2fc9fc8..2813ccbdfe3 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -1,5 +1,5 @@
 # From:	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $Id: Makefile,v 1.27 1999/01/20 21:58:46 jdp Exp $
+# $FreeBSD$
 
 PROG=	login
 MAN1=	login.1
diff --git a/usr.bin/login/login.1 b/usr.bin/login/login.1
index 7bea546b6dc..2ee22ef7f0d 100644
--- a/usr.bin/login/login.1
+++ b/usr.bin/login/login.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)login.1	8.2 (Berkeley) 5/5/94
-.\"	$Id: login.1,v 1.13 1999/01/11 09:07:42 asami Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 5, 1994
 .Dt LOGIN 1
diff --git a/usr.bin/login/login.access.5 b/usr.bin/login/login.access.5
index ff6d21cc14f..10788ed38e6 100644
--- a/usr.bin/login/login.access.5
+++ b/usr.bin/login/login.access.5
@@ -1,5 +1,5 @@
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .\" this is comment
 .Dd April 30, 1994
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index 94a463d90ff..7b7cc97b7d7 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)login.c	8.4 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: login.c,v 1.47 1999/04/24 17:26:32 ache Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/logname/logname.1 b/usr.bin/logname/logname.1
index d8de2ce01f4..e75afcb925e 100644
--- a/usr.bin/logname/logname.1
+++ b/usr.bin/logname/logname.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)logname.1	8.1 (Berkeley) 6/9/93
-.\"	$Id: logname.1,v 1.3 1997/04/27 08:45:45 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt LOGNAME 1
diff --git a/usr.bin/look/look.1 b/usr.bin/look/look.1
index 32958aff71a..ed688b467f3 100644
--- a/usr.bin/look/look.1
+++ b/usr.bin/look/look.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)look.1	8.1 (Berkeley) 6/14/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 14, 1993
 .Dt LOOK 1
diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c
index ddca4d02f69..ad2f35c4f3b 100644
--- a/usr.bin/look/look.c
+++ b/usr.bin/look/look.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)look.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: look.c,v 1.9 1997/09/15 11:02:10 jkh Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/lorder/lorder.1 b/usr.bin/lorder/lorder.1
index 418556e414e..68b074b2bdb 100644
--- a/usr.bin/lorder/lorder.1
+++ b/usr.bin/lorder/lorder.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lorder.1	8.2 (Berkeley) 4/28/95
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 28, 1995
 .Dt LORDER 1
diff --git a/usr.bin/lsvfs/Makefile b/usr.bin/lsvfs/Makefile
index 3b25443ca3a..b2b06113e66 100644
--- a/usr.bin/lsvfs/Makefile
+++ b/usr.bin/lsvfs/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 PROG=	lsvfs
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/lsvfs/lsvfs.1 b/usr.bin/lsvfs/lsvfs.1
index 3bd508350a3..bd075c85db5 100644
--- a/usr.bin/lsvfs/lsvfs.1
+++ b/usr.bin/lsvfs/lsvfs.1
@@ -1,4 +1,4 @@
-.\" $Id: lsvfs.1,v 1.5 1997/02/22 19:55:59 peter Exp $
+.\" $FreeBSD$
 .\" Garrett A. Wollman, September 1994
 .\" This file is in the public domain.
 .\"
diff --git a/usr.bin/lsvfs/lsvfs.c b/usr.bin/lsvfs/lsvfs.c
index d9889042d32..cb6a032e634 100644
--- a/usr.bin/lsvfs/lsvfs.c
+++ b/usr.bin/lsvfs/lsvfs.c
@@ -3,7 +3,7 @@
  * Garrett A. Wollman, September 1994
  * This file is in the public domain.
  *
- * $Id: lsvfs.c,v 1.11 1998/08/29 13:53:22 bde Exp $
+ * $FreeBSD$
  */
 
 #define _NEW_VFSCONF
diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c
index 5c51141e71b..e863a13cbdf 100644
--- a/usr.bin/m4/eval.c
+++ b/usr.bin/m4/eval.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)eval.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: eval.c,v 1.8 1997/08/18 21:01:45 jlemon Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1
index 68d69295eb2..3e5551f4e28 100644
--- a/usr.bin/m4/m4.1
+++ b/usr.bin/m4/m4.1
@@ -1,5 +1,5 @@
 .\"
-.\"	@(#) $Id: m4.1,v 1.7 1998/12/13 23:15:50 steve Exp $
+.\"	@(#) $FreeBSD$
 .\"
 .Dd January 26, 1993
 .Dt M4 1
diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c
index d95f1f2215f..41b7b1385fe 100644
--- a/usr.bin/m4/main.c
+++ b/usr.bin/m4/main.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c
index 9e9c70e8769..452f849cf4d 100644
--- a/usr.bin/m4/misc.c
+++ b/usr.bin/m4/misc.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index 81ea50be886..7109ef44ab2 100644
--- a/usr.bin/mail/mail.1
+++ b/usr.bin/mail/mail.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mail.1	8.2 (Berkeley) 12/30/93
-.\"	$Id: mail.1,v 1.14 1998/01/02 16:43:49 joerg Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt MAIL 1
diff --git a/usr.bin/mail/temp.c b/usr.bin/mail/temp.c
index 5101a74931e..fd14c58e971 100644
--- a/usr.bin/mail/temp.c
+++ b/usr.bin/mail/temp.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)temp.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: temp.c,v 1.4 1998/10/10 09:58:20 thepish Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "rcv.h"
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index 9f6b524a23f..7530945384e 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.2 (Berkeley) 12/28/90
-#	$Id: Makefile,v 1.10 1997/02/22 19:27:05 peter Exp $
+# $FreeBSD$
 
 PROG=	make
 CFLAGS+= -I${.CURDIR} ${CROSS_MAKE_FLAGS}
diff --git a/usr.bin/make/PSD.doc/Makefile b/usr.bin/make/PSD.doc/Makefile
index 432ff314964..d9f5acd3a47 100644
--- a/usr.bin/make/PSD.doc/Makefile
+++ b/usr.bin/make/PSD.doc/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
-#	$Id$
+# $FreeBSD$
 
 DIR=	psd/12.make
 SRCS=	tutorial.ms
diff --git a/usr.bin/make/PSD.doc/tutorial.ms b/usr.bin/make/PSD.doc/tutorial.ms
index 31de37865ec..d4269ca0648 100644
--- a/usr.bin/make/PSD.doc/tutorial.ms
+++ b/usr.bin/make/PSD.doc/tutorial.ms
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tutorial.ms	8.1 (Berkeley) 8/18/93
-.\"	$Id: tutorial.ms,v 1.6 1997/02/22 19:27:31 peter Exp $
+.\" $FreeBSD$
 .\"
 .EH 'PSD:12-%''PMake \*- A Tutorial'
 .OH 'PMake \*- A Tutorial''PSD:12-%'
diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c
index 7f70daddfef..5397e270a4b 100644
--- a/usr.bin/make/arch.c
+++ b/usr.bin/make/arch.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: arch.c,v 1.10 1998/10/15 16:09:56 jdp Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/buf.c b/usr.bin/make/buf.c
index 8ed5aa754a9..74983452f69 100644
--- a/usr.bin/make/buf.c
+++ b/usr.bin/make/buf.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: buf.c,v 1.8 1997/02/22 19:27:06 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/buf.h b/usr.bin/make/buf.h
index 8721bfb6ac2..207262be48d 100644
--- a/usr.bin/make/buf.h
+++ b/usr.bin/make/buf.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)buf.h	8.1 (Berkeley) 6/6/93
- *	$Id: buf.h,v 1.7 1997/02/22 19:27:06 peter Exp $
+ * $FreeBSD$
  */
 
 /*-
diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c
index e894699d25f..ee13bf0d542 100644
--- a/usr.bin/make/compat.c
+++ b/usr.bin/make/compat.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: compat.c,v 1.13 1999/07/31 20:38:22 hoek Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -43,7 +43,7 @@
 static char sccsid[] = "@(#)compat.c	8.2 (Berkeley) 3/19/94";
 #else
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index f19b93a71ce..bbcebd6bb86 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cond.c,v 1.9 1999/08/12 13:30:08 hoek Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/config.h b/usr.bin/make/config.h
index 3d44e2e07e1..5732247eb83 100644
--- a/usr.bin/make/config.h
+++ b/usr.bin/make/config.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)config.h	8.1 (Berkeley) 6/6/93
- *	$Id: config.h,v 1.6 1997/02/22 19:27:08 peter Exp $
+ * $FreeBSD$
  */
 
 #define	DEFSHELL	1			/* Bourne shell */
diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c
index eb059993186..95e6bfb45fc 100644
--- a/usr.bin/make/dir.c
+++ b/usr.bin/make/dir.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: dir.c,v 1.7 1997/02/22 19:27:08 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/dir.h b/usr.bin/make/dir.h
index 62687c5e57e..487957222ee 100644
--- a/usr.bin/make/dir.h
+++ b/usr.bin/make/dir.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)dir.h	8.1 (Berkeley) 6/6/93
- *	$Id$
+ * $FreeBSD$
  */
 
 /* dir.h --
diff --git a/usr.bin/make/for.c b/usr.bin/make/for.c
index 983b9fdba89..0d907cafaa4 100644
--- a/usr.bin/make/for.c
+++ b/usr.bin/make/for.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: for.c,v 1.7 1997/02/22 19:27:09 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/hash.c b/usr.bin/make/hash.c
index 12dfbd9cd41..021980053ea 100644
--- a/usr.bin/make/hash.c
+++ b/usr.bin/make/hash.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: hash.c,v 1.6 1997/02/22 19:27:10 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/hash.h b/usr.bin/make/hash.h
index 6e88ed8f44d..6a1dcbd12f4 100644
--- a/usr.bin/make/hash.h
+++ b/usr.bin/make/hash.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)hash.h	8.1 (Berkeley) 6/6/93
- *	$Id$
+ * $FreeBSD$
  */
 
 /* hash.h --
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index 0dbc3adc2a0..7fac04e3ba1 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: job.c,v 1.13 1999/08/17 00:39:19 hoek Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/job.h b/usr.bin/make/job.h
index 6dac5e49707..87aef22057e 100644
--- a/usr.bin/make/job.h
+++ b/usr.bin/make/job.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)job.h	8.1 (Berkeley) 6/6/93
- *	$Id: job.h,v 1.8 1997/04/21 20:32:11 phk Exp $
+ * $FreeBSD$
  */
 
 /*-
diff --git a/usr.bin/make/list.h b/usr.bin/make/list.h
index fef96425058..e053f1a6d6f 100644
--- a/usr.bin/make/list.h
+++ b/usr.bin/make/list.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)list.h	8.1 (Berkeley) 6/6/93
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/usr.bin/make/lst.h b/usr.bin/make/lst.h
index 3cb3ee1909b..e297ff09d46 100644
--- a/usr.bin/make/lst.h
+++ b/usr.bin/make/lst.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)lst.h	8.1 (Berkeley) 6/6/93
- *	$Id: lst.h,v 1.7 1997/02/22 19:27:13 peter Exp $
+ * $FreeBSD$
  */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstAppend.c b/usr.bin/make/lst.lib/lstAppend.c
index e936f730826..a6d3a7bbd14 100644
--- a/usr.bin/make/lst.lib/lstAppend.c
+++ b/usr.bin/make/lst.lib/lstAppend.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstAtEnd.c b/usr.bin/make/lst.lib/lstAtEnd.c
index c4f7480963d..9d22bef9ba0 100644
--- a/usr.bin/make/lst.lib/lstAtEnd.c
+++ b/usr.bin/make/lst.lib/lstAtEnd.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstAtFront.c b/usr.bin/make/lst.lib/lstAtFront.c
index 720e6635e17..57a89506289 100644
--- a/usr.bin/make/lst.lib/lstAtFront.c
+++ b/usr.bin/make/lst.lib/lstAtFront.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstClose.c b/usr.bin/make/lst.lib/lstClose.c
index f28119f056d..d0a8e9f6600 100644
--- a/usr.bin/make/lst.lib/lstClose.c
+++ b/usr.bin/make/lst.lib/lstClose.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstConcat.c b/usr.bin/make/lst.lib/lstConcat.c
index 5cb8a67f63b..fd98a308bf8 100644
--- a/usr.bin/make/lst.lib/lstConcat.c
+++ b/usr.bin/make/lst.lib/lstConcat.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstDatum.c b/usr.bin/make/lst.lib/lstDatum.c
index ec7d11c91e6..afb84b46fec 100644
--- a/usr.bin/make/lst.lib/lstDatum.c
+++ b/usr.bin/make/lst.lib/lstDatum.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstDeQueue.c b/usr.bin/make/lst.lib/lstDeQueue.c
index 62335022c83..a10becbc0be 100644
--- a/usr.bin/make/lst.lib/lstDeQueue.c
+++ b/usr.bin/make/lst.lib/lstDeQueue.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstDestroy.c b/usr.bin/make/lst.lib/lstDestroy.c
index e2414522ac6..2a84d638c0c 100644
--- a/usr.bin/make/lst.lib/lstDestroy.c
+++ b/usr.bin/make/lst.lib/lstDestroy.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstDupl.c b/usr.bin/make/lst.lib/lstDupl.c
index cc5e75e1ebb..a29fa2febec 100644
--- a/usr.bin/make/lst.lib/lstDupl.c
+++ b/usr.bin/make/lst.lib/lstDupl.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstEnQueue.c b/usr.bin/make/lst.lib/lstEnQueue.c
index d7627f33b3e..cafc4a69947 100644
--- a/usr.bin/make/lst.lib/lstEnQueue.c
+++ b/usr.bin/make/lst.lib/lstEnQueue.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstFind.c b/usr.bin/make/lst.lib/lstFind.c
index fbbae668941..a74d6b9b6bf 100644
--- a/usr.bin/make/lst.lib/lstFind.c
+++ b/usr.bin/make/lst.lib/lstFind.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstFindFrom.c b/usr.bin/make/lst.lib/lstFindFrom.c
index 6c64cf1483f..96ce3b079cf 100644
--- a/usr.bin/make/lst.lib/lstFindFrom.c
+++ b/usr.bin/make/lst.lib/lstFindFrom.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstFirst.c b/usr.bin/make/lst.lib/lstFirst.c
index e7a30397d55..b9f2ae55286 100644
--- a/usr.bin/make/lst.lib/lstFirst.c
+++ b/usr.bin/make/lst.lib/lstFirst.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstForEach.c b/usr.bin/make/lst.lib/lstForEach.c
index 1688e9d36d7..95ee44abbc2 100644
--- a/usr.bin/make/lst.lib/lstForEach.c
+++ b/usr.bin/make/lst.lib/lstForEach.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstForEachFrom.c b/usr.bin/make/lst.lib/lstForEachFrom.c
index 7692c57e780..aff154f70e0 100644
--- a/usr.bin/make/lst.lib/lstForEachFrom.c
+++ b/usr.bin/make/lst.lib/lstForEachFrom.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstInit.c b/usr.bin/make/lst.lib/lstInit.c
index a16fca27c45..7b3c2b08931 100644
--- a/usr.bin/make/lst.lib/lstInit.c
+++ b/usr.bin/make/lst.lib/lstInit.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstInsert.c b/usr.bin/make/lst.lib/lstInsert.c
index 8c4ebcb30b0..3c3861e1180 100644
--- a/usr.bin/make/lst.lib/lstInsert.c
+++ b/usr.bin/make/lst.lib/lstInsert.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstInt.h b/usr.bin/make/lst.lib/lstInt.h
index dd38bf0eaa6..0e287405ab3 100644
--- a/usr.bin/make/lst.lib/lstInt.h
+++ b/usr.bin/make/lst.lib/lstInt.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)lstInt.h	8.1 (Berkeley) 6/6/93
- *	$Id: lstInt.h,v 1.5 1997/02/22 19:27:40 peter Exp $
+ * $FreeBSD$
  */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstIsAtEnd.c b/usr.bin/make/lst.lib/lstIsAtEnd.c
index 2c480197c1e..50a4de01931 100644
--- a/usr.bin/make/lst.lib/lstIsAtEnd.c
+++ b/usr.bin/make/lst.lib/lstIsAtEnd.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstIsEmpty.c b/usr.bin/make/lst.lib/lstIsEmpty.c
index 6a9a7bdb5a2..79a27431e4d 100644
--- a/usr.bin/make/lst.lib/lstIsEmpty.c
+++ b/usr.bin/make/lst.lib/lstIsEmpty.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstLast.c b/usr.bin/make/lst.lib/lstLast.c
index 49b2f8e39ad..1affe2e0c38 100644
--- a/usr.bin/make/lst.lib/lstLast.c
+++ b/usr.bin/make/lst.lib/lstLast.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstMember.c b/usr.bin/make/lst.lib/lstMember.c
index cc5cb4f416d..7e3c2ceb9f7 100644
--- a/usr.bin/make/lst.lib/lstMember.c
+++ b/usr.bin/make/lst.lib/lstMember.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstNext.c b/usr.bin/make/lst.lib/lstNext.c
index f6e2656e89e..6008d0a485b 100644
--- a/usr.bin/make/lst.lib/lstNext.c
+++ b/usr.bin/make/lst.lib/lstNext.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstOpen.c b/usr.bin/make/lst.lib/lstOpen.c
index fbb7d0e7b29..9af9c7cd163 100644
--- a/usr.bin/make/lst.lib/lstOpen.c
+++ b/usr.bin/make/lst.lib/lstOpen.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstRemove.c b/usr.bin/make/lst.lib/lstRemove.c
index e84d301ec62..be8b375e4b7 100644
--- a/usr.bin/make/lst.lib/lstRemove.c
+++ b/usr.bin/make/lst.lib/lstRemove.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstReplace.c b/usr.bin/make/lst.lib/lstReplace.c
index a2dcb459da2..967da863f6a 100644
--- a/usr.bin/make/lst.lib/lstReplace.c
+++ b/usr.bin/make/lst.lib/lstReplace.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstSucc.c b/usr.bin/make/lst.lib/lstSucc.c
index b43a00cb4dc..6412f3e52d8 100644
--- a/usr.bin/make/lst.lib/lstSucc.c
+++ b/usr.bin/make/lst.lib/lstSucc.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index 3aecd8332fe..25726b871a5 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -47,7 +47,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 3/19/94";
 #else
 static const char rcsid[] =
-	"$Id: main.c,v 1.32 1999/07/31 20:53:01 hoek Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index ff3e6178635..642e7e78ccf 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
-.\"	$Id: make.1,v 1.22 1999/08/14 06:47:13 chris Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 19, 1994
 .Dt MAKE 1
diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c
index 509215c2746..6c53c052caa 100644
--- a/usr.bin/make/make.c
+++ b/usr.bin/make/make.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: make.c,v 1.8 1997/02/22 19:27:16 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -43,7 +43,7 @@
 static char sccsid[] = "@(#)make.c	8.1 (Berkeley) 6/6/93";
 #else
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h
index 3845e7dafa0..24106519eb3 100644
--- a/usr.bin/make/make.h
+++ b/usr.bin/make/make.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)make.h	8.3 (Berkeley) 6/13/95
- *	$Id: make.h,v 1.9 1999/07/31 20:53:02 hoek Exp $
+ * $FreeBSD$
  */
 
 /*-
diff --git a/usr.bin/make/nonints.h b/usr.bin/make/nonints.h
index 4b8b21152b0..ce1665d96c8 100644
--- a/usr.bin/make/nonints.h
+++ b/usr.bin/make/nonints.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)nonints.h	8.3 (Berkeley) 3/19/94
- *	$Id: nonints.h,v 1.6 1997/02/22 19:27:17 peter Exp $
+ * $FreeBSD$
  */
 
 /* arch.c */
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index 5b2ceb79781..e7e5daf9deb 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -41,7 +41,7 @@
 static char sccsid[] = "@(#)parse.c	8.3 (Berkeley) 3/19/94";
 #else
 static const char rcsid[] =
-	"$Id: parse.c,v 1.20 1999/01/08 18:37:34 jkh Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/pathnames.h b/usr.bin/make/pathnames.h
index d456c357ff2..1f15c082ead 100644
--- a/usr.bin/make/pathnames.h
+++ b/usr.bin/make/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pathnames.h	5.2 (Berkeley) 6/1/90
- *	$Id: pathnames.h,v 1.7 1997/02/22 19:27:20 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef _PATH_OBJDIR
diff --git a/usr.bin/make/sprite.h b/usr.bin/make/sprite.h
index ca55509e22e..ee20057f43b 100644
--- a/usr.bin/make/sprite.h
+++ b/usr.bin/make/sprite.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sprite.h	8.1 (Berkeley) 6/6/93
- *	$Id: sprite.h,v 1.7 1997/02/22 19:27:21 peter Exp $
+ * $FreeBSD$
  */
 
 /*
diff --git a/usr.bin/make/str.c b/usr.bin/make/str.c
index 7d17dd621ea..524d9001aa9 100644
--- a/usr.bin/make/str.c
+++ b/usr.bin/make/str.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: str.c,v 1.9 1997/02/22 19:27:23 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
@@ -43,7 +43,7 @@
 static char sccsid[] = "@(#)str.c	5.8 (Berkeley) 6/1/90";
 #else
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c
index 898cc9e1bdf..0bec455ead4 100644
--- a/usr.bin/make/suff.c
+++ b/usr.bin/make/suff.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: suff.c,v 1.9 1998/04/26 09:44:48 phk Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/targ.c b/usr.bin/make/targ.c
index 21aaa64dbe3..04ab4188919 100644
--- a/usr.bin/make/targ.c
+++ b/usr.bin/make/targ.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: targ.c,v 1.7 1997/02/22 19:27:24 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/make/util.c b/usr.bin/make/util.c
index 62b0e79dab6..174954eb445 100644
--- a/usr.bin/make/util.c
+++ b/usr.bin/make/util.c
@@ -3,7 +3,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id$";
+static char rcsid[] = "$FreeBSD$";
 #endif
 
 #include <stdio.h>
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index 2f29567b4e5..f9ae2b126d0 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: var.c,v 1.13 1999/07/31 20:53:02 hoek Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/mesg/mesg.1 b/usr.bin/mesg/mesg.1
index 2dce0b1651f..7bdf0fd1724 100644
--- a/usr.bin/mesg/mesg.1
+++ b/usr.bin/mesg/mesg.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mesg.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: mesg.1,v 1.5 1997/03/29 20:01:59 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt MESG 1
diff --git a/usr.bin/mesg/mesg.c b/usr.bin/mesg/mesg.c
index 5faffa4a7ef..4e5878b2a1a 100644
--- a/usr.bin/mesg/mesg.c
+++ b/usr.bin/mesg/mesg.c
@@ -47,7 +47,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mesg.c	8.2 (Berkeley) 1/21/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/minigzip/Makefile b/usr.bin/minigzip/Makefile
index 4d7fff388e3..edc5d85e81c 100644
--- a/usr.bin/minigzip/Makefile
+++ b/usr.bin/minigzip/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.1 1997/12/13 09:57:48 msmith Exp $
+# $FreeBSD$
 
 PROG=	minigzip
 LDADD+=	-lz
diff --git a/usr.bin/minigzip/minigzip.1 b/usr.bin/minigzip/minigzip.1
index 7ace82cbf4e..48a60ea1132 100644
--- a/usr.bin/minigzip/minigzip.1
+++ b/usr.bin/minigzip/minigzip.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: minigzip.1,v 1.1.1.1 1997/12/13 09:57:48 msmith Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 13, 1997
 .Dt MINIGZIP 1
diff --git a/usr.bin/mk_cmds/Makefile b/usr.bin/mk_cmds/Makefile
index 8cc838403d6..5286e0126ad 100644
--- a/usr.bin/mk_cmds/Makefile
+++ b/usr.bin/mk_cmds/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.6 1998/05/04 20:09:03 bde Exp $
+# $FreeBSD$
 
 PROG=	mk_cmds
 SRCS=	mk_cmds.c options.c utils.c ct.y cmd_tbl.l y.tab.h
diff --git a/usr.bin/mkdep/mkdep.1 b/usr.bin/mkdep/mkdep.1
index f19fbc87c61..9165a0e2a6f 100644
--- a/usr.bin/mkdep/mkdep.1
+++ b/usr.bin/mkdep/mkdep.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkdep.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt MKDEP 1
diff --git a/usr.bin/mkdep/mkdep.gcc.sh b/usr.bin/mkdep/mkdep.gcc.sh
index ff4e2f36013..ec00dcfbdf9 100644
--- a/usr.bin/mkdep/mkdep.gcc.sh
+++ b/usr.bin/mkdep/mkdep.gcc.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)mkdep.gcc.sh	8.1 (Berkeley) 6/6/93
-#	$Id: mkdep.gcc.sh,v 1.14 1998/08/24 10:16:39 cracauer Exp $
+# $FreeBSD$
 
 D=.depend			# default dependency file is .depend
 append=0
diff --git a/usr.bin/mkfifo/mkfifo.1 b/usr.bin/mkfifo/mkfifo.1
index 44fe0044cb1..a7443c57664 100644
--- a/usr.bin/mkfifo/mkfifo.1
+++ b/usr.bin/mkfifo/mkfifo.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkfifo.1	8.2 (Berkeley) 1/5/94
-.\"	$Id: mkfifo.1,v 1.4 1997/04/27 08:45:45 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 5, 1994
 .Dt MKFIFO 1
diff --git a/usr.bin/mkfifo/mkfifo.c b/usr.bin/mkfifo/mkfifo.c
index 270951a5d0d..7f97a13566b 100644
--- a/usr.bin/mkfifo/mkfifo.c
+++ b/usr.bin/mkfifo/mkfifo.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mkfifo.c	8.2 (Berkeley) 1/5/94";
 #endif
 static const char rcsid[] =
-	"$Id: mkfifo.c,v 1.3 1997/07/24 07:02:55 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/mklocale/Makefile b/usr.bin/mklocale/Makefile
index 41933a9c1a5..955c8c2fe96 100644
--- a/usr.bin/mklocale/Makefile
+++ b/usr.bin/mklocale/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/7/93
-#	$Id: Makefile,v 1.18 1998/05/04 20:09:03 bde Exp $
+# $FreeBSD$
 
 PROG=	mklocale
 SRCS=	yacc.y lex.l y.tab.h
diff --git a/usr.bin/mklocale/data/Makefile b/usr.bin/mklocale/data/Makefile
index 2ef612c9f74..1c446a9ca13 100644
--- a/usr.bin/mklocale/data/Makefile
+++ b/usr.bin/mklocale/data/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.18 1999/06/05 03:04:00 julian Exp $
+# $FreeBSD$
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
diff --git a/usr.bin/mklocale/data/lt_LN.ISO_8859-2.src b/usr.bin/mklocale/data/lt_LN.ISO_8859-2.src
index 3f9ad913e06..a9fa03fc89e 100644
--- a/usr.bin/mklocale/data/lt_LN.ISO_8859-2.src
+++ b/usr.bin/mklocale/data/lt_LN.ISO_8859-2.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for the iso_8859_2 Locale
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 ENCODING	"NONE"
diff --git a/usr.bin/mklocale/data/zh_CN.EUC.src b/usr.bin/mklocale/data/zh_CN.EUC.src
index 1680f3cc199..b298ef5de56 100644
--- a/usr.bin/mklocale/data/zh_CN.EUC.src
+++ b/usr.bin/mklocale/data/zh_CN.EUC.src
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: zh_CN.EUC.src,v 1.1 1998/08/10 09:49:42 phk Exp $
+ * $FreeBSD$
  */
 
 ENCODING	"EUC"
diff --git a/usr.bin/mklocale/mklocale.1 b/usr.bin/mklocale/mklocale.1
index 842b434db49..34ec49f24ab 100644
--- a/usr.bin/mklocale/mklocale.1
+++ b/usr.bin/mklocale/mklocale.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mklocale.1	8.2 (Berkeley) 4/18/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt MKLOCALE 1
diff --git a/usr.bin/mkstr/mkstr.1 b/usr.bin/mkstr/mkstr.1
index 00d981389a2..9486c8c4bf7 100644
--- a/usr.bin/mkstr/mkstr.1
+++ b/usr.bin/mkstr/mkstr.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkstr.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt MKSTR 1
diff --git a/usr.bin/mkstr/mkstr.c b/usr.bin/mkstr/mkstr.c
index 588af2c2076..a0db8894959 100644
--- a/usr.bin/mkstr/mkstr.c
+++ b/usr.bin/mkstr/mkstr.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mkstr.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: mkstr.c,v 1.2 1997/07/24 07:05:02 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/mktemp/mktemp.1 b/usr.bin/mktemp/mktemp.1
index 25e8b4ff731..1e5eff0c375 100644
--- a/usr.bin/mktemp/mktemp.1
+++ b/usr.bin/mktemp/mktemp.1
@@ -32,7 +32,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd November, 20, 1996
 .Dt MKTEMP 1
diff --git a/usr.bin/more/Makefile b/usr.bin/more/Makefile
index e63efcf6009..79048432118 100644
--- a/usr.bin/more/Makefile
+++ b/usr.bin/more/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	more
 CFLAGS+=-I${.CURDIR} -DTERMIOS
diff --git a/usr.bin/more/command.c b/usr.bin/more/command.c
index ba6430ad99d..0a400d881bc 100644
--- a/usr.bin/more/command.c
+++ b/usr.bin/more/command.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)command.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-        "$Id: command.c,v 1.12 1999/06/01 20:02:31 hoek Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/more/decode.c b/usr.bin/more/decode.c
index 2d490fae560..4a331527594 100644
--- a/usr.bin/more/decode.c
+++ b/usr.bin/more/decode.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)decode.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-        "$Id: decode.c,v 1.2 1999/05/30 18:06:53 hoek Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/input.c b/usr.bin/more/input.c
index b22c3d9fd2a..50e2031724a 100644
--- a/usr.bin/more/input.c
+++ b/usr.bin/more/input.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)input.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-        "$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/less.h b/usr.bin/more/less.h
index deb7ec50620..e17ec403821 100644
--- a/usr.bin/more/less.h
+++ b/usr.bin/more/less.h
@@ -33,7 +33,7 @@
  *
  *	@(#)less.h	8.1 (Berkeley) 6/6/93
  *
- *	$Id: less.h,v 1.3 1999/05/30 18:06:55 hoek Exp $
+ * $FreeBSD$
  */
 
 #define	NULL_POSITION	((off_t)(-1))
diff --git a/usr.bin/more/line.c b/usr.bin/more/line.c
index 88178bb76a2..6b980739b1d 100644
--- a/usr.bin/more/line.c
+++ b/usr.bin/more/line.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)line.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-        "$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/main.c b/usr.bin/more/main.c
index 52e81bf1039..f7159eaafbb 100644
--- a/usr.bin/more/main.c
+++ b/usr.bin/more/main.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/7/93";
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: main.c,v 1.11 1999/05/30 18:06:56 hoek Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/more.1 b/usr.bin/more/more.1
index c31a7c1f43c..09bd03066c8 100644
--- a/usr.bin/more/more.1
+++ b/usr.bin/more/more.1
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)more.1	8.2 (Berkeley) 4/18/94
-.\"	$Id: more.1,v 1.11 1999/07/12 20:23:47 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt MORE 1
diff --git a/usr.bin/more/option.c b/usr.bin/more/option.c
index 79fd849e2a3..53f332b9e6c 100644
--- a/usr.bin/more/option.c
+++ b/usr.bin/more/option.c
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)option.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: option.c,v 1.4 1998/07/25 05:56:49 hoek Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.bin/more/output.c b/usr.bin/more/output.c
index 862dbc22a4b..337a294e6b9 100644
--- a/usr.bin/more/output.c
+++ b/usr.bin/more/output.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)output.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-        "$Id: output.c,v 1.9 1999/05/30 18:06:56 hoek Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/prim.c b/usr.bin/more/prim.c
index bb815672e51..03fcad8d408 100644
--- a/usr.bin/more/prim.c
+++ b/usr.bin/more/prim.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)prim.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-        "$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/tags.c b/usr.bin/more/tags.c
index c48c99fc389..1014d48494b 100644
--- a/usr.bin/more/tags.c
+++ b/usr.bin/more/tags.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)tags.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-        "$Id: tags.c,v 1.5 1999/06/04 19:35:22 hoek Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/msgs/Makefile b/usr.bin/msgs/Makefile
index 8613f79cb5e..21cb1515556 100644
--- a/usr.bin/msgs/Makefile
+++ b/usr.bin/msgs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	msgs
 DPADD=	${LIBTERMCAP}
diff --git a/usr.bin/msgs/msgs.1 b/usr.bin/msgs/msgs.1
index 2efddec4372..3139f00dc94 100644
--- a/usr.bin/msgs/msgs.1
+++ b/usr.bin/msgs/msgs.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)msgs.1	8.2 (Berkeley) 4/28/95
-.\"	$Id: msgs.1,v 1.6 1999/07/12 20:23:47 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 28, 1995
 .Dt MSGS 1
diff --git a/usr.bin/msgs/msgs.c b/usr.bin/msgs/msgs.c
index ff09c9e0724..17536400f46 100644
--- a/usr.bin/msgs/msgs.c
+++ b/usr.bin/msgs/msgs.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)msgs.c	8.2 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: msgs.c,v 1.13 1998/07/14 19:07:30 ghelmer Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/mt/Makefile b/usr.bin/mt/Makefile
index b09a36b6d37..0e692e92cd1 100644
--- a/usr.bin/mt/Makefile
+++ b/usr.bin/mt/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	mt
 CFLAGS+=-I${.CURDIR}/../../sys
diff --git a/usr.bin/mt/mt.1 b/usr.bin/mt/mt.1
index 9a988057e9c..5647313b2a1 100644
--- a/usr.bin/mt/mt.1
+++ b/usr.bin/mt/mt.1
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mt.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt MT 1
diff --git a/usr.bin/mt/mt.c b/usr.bin/mt/mt.c
index ff2a2d64b57..9fcb727e197 100644
--- a/usr.bin/mt/mt.c
+++ b/usr.bin/mt/mt.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mt.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: mt.c,v 1.24 1999/03/10 18:42:20 mjacob Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/ncal/Makefile b/usr.bin/ncal/Makefile
index 7d0212cbd0f..569453240d6 100644
--- a/usr.bin/ncal/Makefile
+++ b/usr.bin/ncal/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 PROG= ncal
 SRCS= ncal.c
 
diff --git a/usr.bin/ncal/ncal.1 b/usr.bin/ncal/ncal.1
index 635cc926ea3..5636440d0e5 100644
--- a/usr.bin/ncal/ncal.1
+++ b/usr.bin/ncal/ncal.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: ncal.1,v 1.6 1998/03/23 07:45:08 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 16, 1997
 .Dt CAL 1
diff --git a/usr.bin/ncal/ncal.c b/usr.bin/ncal/ncal.c
index 03f48a93b06..5feac67afa9 100644
--- a/usr.bin/ncal/ncal.c
+++ b/usr.bin/ncal/ncal.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: ncal.c,v 1.7 1999/03/27 21:08:13 helbig Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <calendar.h>
diff --git a/usr.bin/netstat/atalk.c b/usr.bin/netstat/atalk.c
index 90ed87dbe5c..f0a72e48eae 100644
--- a/usr.bin/netstat/atalk.c
+++ b/usr.bin/netstat/atalk.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)atalk.c	1.1 (Whistle) 6/6/96";
 */
 static const char rcsid[] =
-	"$Id: atalk.c,v 1.10 1997/07/29 06:51:39 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index 26191f8b82a..61ad2b6cd30 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)if.c	8.3 (Berkeley) 4/28/95";
 */
 static const char rcsid[] =
-	"$Id: if.c,v 1.25 1999/04/20 22:04:31 billf Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c
index 08777aa20e9..826afccce4e 100644
--- a/usr.bin/netstat/inet.c
+++ b/usr.bin/netstat/inet.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)inet.c	8.5 (Berkeley) 5/24/95";
 */
 static const char rcsid[] =
-	"$Id: inet.c,v 1.31 1999/03/10 17:25:42 des Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/ipx.c b/usr.bin/netstat/ipx.c
index 215cbd0309b..3495adaadf5 100644
--- a/usr.bin/netstat/ipx.c
+++ b/usr.bin/netstat/ipx.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)ns.c	8.1 (Berkeley) 6/6/93";
 */
 static const char rcsid[] =
-	"$Id: ipx.c,v 1.9 1997/07/29 06:51:39 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index 0f3072ef3bd..f3c956387b5 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -42,7 +42,7 @@ char const copyright[] =
 static char sccsid[] = "@(#)main.c	8.4 (Berkeley) 3/1/94";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.25 1999/04/26 16:11:48 luigi Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c
index 76e001fdc82..921b31ac7be 100644
--- a/usr.bin/netstat/mbuf.c
+++ b/usr.bin/netstat/mbuf.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)mbuf.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: mbuf.c,v 1.14 1998/08/23 15:23:11 gpalmer Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1
index 22b3a5d0619..6a77a482af2 100644
--- a/usr.bin/netstat/netstat.1
+++ b/usr.bin/netstat/netstat.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)netstat.1	8.8 (Berkeley) 4/18/94
-.\"	$Id: netstat.1,v 1.13 1999/07/12 20:23:49 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt NETSTAT 1
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index 24b5a9b4e1a..129337bfbca 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "From: @(#)route.c	8.6 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: route.c,v 1.32 1998/07/06 20:52:08 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/unix.c b/usr.bin/netstat/unix.c
index 195588e2c1a..345e28a4ee4 100644
--- a/usr.bin/netstat/unix.c
+++ b/usr.bin/netstat/unix.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)unix.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: unix.c,v 1.10 1998/08/08 08:13:04 phk Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/newkey/Makefile b/usr.bin/newkey/Makefile
index e976b9a5bb9..75f369face5 100644
--- a/usr.bin/newkey/Makefile
+++ b/usr.bin/newkey/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1.1.1 1997/05/28 15:52:07 wpaul Exp $
+# $FreeBSD$
 
 PROG= newkey
 SRCS= newkey.c update.c generic.c
diff --git a/usr.bin/newkey/generic.c b/usr.bin/newkey/generic.c
index 2c3ec1e8cbe..4067867d659 100644
--- a/usr.bin/newkey/generic.c
+++ b/usr.bin/newkey/generic.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)generic.c 1.2 91/03/11 Copyr 1986 Sun Micro";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/usr.bin/newkey/newkey.8 b/usr.bin/newkey/newkey.8
index ad9f990ad07..d17c9594a69 100644
--- a/usr.bin/newkey/newkey.8
+++ b/usr.bin/newkey/newkey.8
@@ -1,5 +1,5 @@
 .\" @(#)newkey.8 1.3 91/03/11 TIRPC 1.0; from 1.12 90/02/03 SMI;
-.\" $Id$
+.\" $FreeBSD$
 .Dd October 12, 1987
 .Dt NEWKEY 8
 .Os
diff --git a/usr.bin/newkey/newkey.c b/usr.bin/newkey/newkey.c
index dcf14ecab28..141614ee088 100644
--- a/usr.bin/newkey/newkey.c
+++ b/usr.bin/newkey/newkey.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)newkey.c 1.8 91/03/11 Copyr 1986 Sun Micro";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/usr.bin/newkey/update.c b/usr.bin/newkey/update.c
index 609977a593d..2f1c53fab9a 100644
--- a/usr.bin/newkey/update.c
+++ b/usr.bin/newkey/update.c
@@ -32,7 +32,7 @@
 static	char sccsid[] = "@(#)update.c 1.2 91/03/11 Copyr 1986 Sun Micro";
 #endif
 static const char rcsid[] =
-	"$Id: update.c,v 1.3 1998/02/20 04:38:20 jb Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/usr.bin/nfsstat/nfsstat.1 b/usr.bin/nfsstat/nfsstat.1
index 4d29692de52..94f36d75018 100644
--- a/usr.bin/nfsstat/nfsstat.1
+++ b/usr.bin/nfsstat/nfsstat.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)nfsstat.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: nfsstat.1,v 1.6 1997/02/22 19:56:24 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt NFSSTAT 1
diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c
index 3ba45c9cc0c..f68f6216c3e 100644
--- a/usr.bin/nfsstat/nfsstat.c
+++ b/usr.bin/nfsstat/nfsstat.c
@@ -45,7 +45,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)nfsstat.c	8.2 (Berkeley) 3/31/95";
 #endif
 static const char rcsid[] =
-	"$Id: nfsstat.c,v 1.11 1998/10/24 19:36:52 msmith Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/nice/nice.1 b/usr.bin/nice/nice.1
index 010a3458f49..2531a9ca4aa 100644
--- a/usr.bin/nice/nice.1
+++ b/usr.bin/nice/nice.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)nice.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: nice.1,v 1.8 1999/06/25 20:54:28 billf Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt NICE 1
diff --git a/usr.bin/nm/nm.1 b/usr.bin/nm/nm.1
index a1f8b3c462f..d6a52d22b42 100644
--- a/usr.bin/nm/nm.1
+++ b/usr.bin/nm/nm.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nm.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: nm.1,v 1.7 1997/02/22 19:56:28 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt NM 1
diff --git a/usr.bin/nm/nm.1aout b/usr.bin/nm/nm.1aout
index a1f8b3c462f..d6a52d22b42 100644
--- a/usr.bin/nm/nm.1aout
+++ b/usr.bin/nm/nm.1aout
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nm.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: nm.1,v 1.7 1997/02/22 19:56:28 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt NM 1
diff --git a/usr.bin/nm/nm.c b/usr.bin/nm/nm.c
index 1e6cbc5d6de..91665b229a5 100644
--- a/usr.bin/nm/nm.c
+++ b/usr.bin/nm/nm.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)nm.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: nm.c,v 1.11 1997/07/31 06:53:36 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/nohup/nohup.1 b/usr.bin/nohup/nohup.1
index 780cd7ba823..1fcc7efd3a2 100644
--- a/usr.bin/nohup/nohup.1
+++ b/usr.bin/nohup/nohup.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)nohup.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt NOHUP 1
diff --git a/usr.bin/nohup/nohup.c b/usr.bin/nohup/nohup.c
index 3455c7cb797..8992997b6cf 100644
--- a/usr.bin/nohup/nohup.c
+++ b/usr.bin/nohup/nohup.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)nohup.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: nohup.c,v 1.2 1997/07/31 06:54:45 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/objformat/objformat.1 b/usr.bin/objformat/objformat.1
index 28cb408bb2c..9fde70c17d6 100644
--- a/usr.bin/objformat/objformat.1
+++ b/usr.bin/objformat/objformat.1
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: objformat.1,v 1.1 1998/10/25 13:25:42 obrien Exp $
+.\" $FreeBSD$
 .\"
 .Dd October 25, 1998
 .Os
diff --git a/usr.bin/opieinfo/Makefile b/usr.bin/opieinfo/Makefile
index 1e3f9778feb..7f7241dc5e7 100644
--- a/usr.bin/opieinfo/Makefile
+++ b/usr.bin/opieinfo/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 
diff --git a/usr.bin/opiekey/Makefile b/usr.bin/opiekey/Makefile
index de04e8daa6e..6c43636ad57 100644
--- a/usr.bin/opiekey/Makefile
+++ b/usr.bin/opiekey/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 
diff --git a/usr.bin/opiepasswd/Makefile b/usr.bin/opiepasswd/Makefile
index bb52c8229bc..7fc70ffbf5e 100644
--- a/usr.bin/opiepasswd/Makefile
+++ b/usr.bin/opiepasswd/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 
diff --git a/usr.bin/pagesize/pagesize.1 b/usr.bin/pagesize/pagesize.1
index d89cd9a33d8..aac371d04db 100644
--- a/usr.bin/pagesize/pagesize.1
+++ b/usr.bin/pagesize/pagesize.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)pagesize.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt PAGESIZE 1
diff --git a/usr.bin/pagesize/pagesize.sh b/usr.bin/pagesize/pagesize.sh
index 4c7aeea75e0..fd5477b3222 100644
--- a/usr.bin/pagesize/pagesize.sh
+++ b/usr.bin/pagesize/pagesize.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)pagesize.sh	8.1 (Berkeley) 4/3/94
-#	$Id$
+# $FreeBSD$
 #
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index d376bff0a3e..9ac3f0dab72 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,5 +1,5 @@
 # From:	@(#)Makefile	8.3 (Berkeley) 4/2/94
-# $Id: Makefile,v 1.31 1999/02/14 13:56:15 des Exp $
+# $FreeBSD$
 
 PROG=	passwd
 SRCS=	local_passwd.c passwd.c pw_copy.c pw_util.c pw_yp.c \
diff --git a/usr.bin/passwd/extern.h b/usr.bin/passwd/extern.h
index 7a4bd127c98..287646c6a38 100644
--- a/usr.bin/passwd/extern.h
+++ b/usr.bin/passwd/extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)extern.h	8.1 (Berkeley) 4/2/94
- *	$Id$
+ * $FreeBSD$
  */
 
 int	krb_passwd __P((char *, char *, char *, char *));
diff --git a/usr.bin/passwd/local_passwd.c b/usr.bin/passwd/local_passwd.c
index 339d5e31be0..07e1d183d44 100644
--- a/usr.bin/passwd/local_passwd.c
+++ b/usr.bin/passwd/local_passwd.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/passwd/passwd.1 b/usr.bin/passwd/passwd.1
index 140c203d16e..8019c759b8d 100644
--- a/usr.bin/passwd/passwd.1
+++ b/usr.bin/passwd/passwd.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)passwd.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: passwd.1,v 1.14 1999/04/30 18:19:42 hoek Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt PASSWD 1
diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c
index 19a18309ace..e69864a0ded 100644
--- a/usr.bin/passwd/passwd.c
+++ b/usr.bin/passwd/passwd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)passwd.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: passwd.c,v 1.14 1998/03/23 14:14:24 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/paste/paste.1 b/usr.bin/paste/paste.1
index 7b97915e509..77253ffafbb 100644
--- a/usr.bin/paste/paste.1
+++ b/usr.bin/paste/paste.1
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)paste.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt PASTE 1
diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c
index 7e14a56b779..a1971199b49 100644
--- a/usr.bin/paste/paste.c
+++ b/usr.bin/paste/paste.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)paste.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: paste.c,v 1.4 1997/08/05 03:40:04 asami Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/pr/pr.1 b/usr.bin/pr/pr.1
index 74d6d7c8f45..d6afef32713 100644
--- a/usr.bin/pr/pr.1
+++ b/usr.bin/pr/pr.1
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pr.1	8.3 (Berkeley) 4/18/94
-.\"	$Id: pr.1,v 1.4 1997/02/22 19:56:37 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt PR 1
diff --git a/usr.bin/printenv/printenv.1 b/usr.bin/printenv/printenv.1
index d3f8a145d4e..18f76ee93e8 100644
--- a/usr.bin/printenv/printenv.1
+++ b/usr.bin/printenv/printenv.1
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)printenv.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: printenv.1,v 1.3 1999/07/12 20:23:52 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt PRINTENV 1
diff --git a/usr.bin/printf/printf.1 b/usr.bin/printf/printf.1
index e84aa2de1bf..665d28fe3dd 100644
--- a/usr.bin/printf/printf.1
+++ b/usr.bin/printf/printf.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)printf.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt PRINTF 1
diff --git a/usr.bin/quota/quota.1 b/usr.bin/quota/quota.1
index c9bdb10412a..7d1a471e98b 100644
--- a/usr.bin/quota/quota.1
+++ b/usr.bin/quota/quota.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)quota.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: quota.1,v 1.5 1997/02/22 19:56:38 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt QUOTA 1
diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c
index c9a15eebb47..246922df88b 100644
--- a/usr.bin/quota/quota.c
+++ b/usr.bin/quota/quota.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "from: @(#)quota.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: quota.c,v 1.9 1998/06/09 04:30:54 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/ranlib/Makefile b/usr.bin/ranlib/Makefile
index 60ba526cff8..8148e57c2ba 100644
--- a/usr.bin/ranlib/Makefile
+++ b/usr.bin/ranlib/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	ranlib
 SRCS=	archive.c build.c misc.c ranlib.c touch.c
diff --git a/usr.bin/ranlib/build.c b/usr.bin/ranlib/build.c
index eedb7215d08..b4d8bc69a8e 100644
--- a/usr.bin/ranlib/build.c
+++ b/usr.bin/ranlib/build.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)build.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/ranlib/misc.c b/usr.bin/ranlib/misc.c
index 97e970de114..19b4854cbfa 100644
--- a/usr.bin/ranlib/misc.c
+++ b/usr.bin/ranlib/misc.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ranlib/ranlib.1 b/usr.bin/ranlib/ranlib.1
index 2d37924b766..d57cf9836a4 100644
--- a/usr.bin/ranlib/ranlib.1
+++ b/usr.bin/ranlib/ranlib.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ranlib.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: ranlib.1,v 1.5 1997/02/22 19:56:39 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt RANLIB 1
diff --git a/usr.bin/ranlib/ranlib.1aout b/usr.bin/ranlib/ranlib.1aout
index 2d37924b766..d57cf9836a4 100644
--- a/usr.bin/ranlib/ranlib.1aout
+++ b/usr.bin/ranlib/ranlib.1aout
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ranlib.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: ranlib.1,v 1.5 1997/02/22 19:56:39 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt RANLIB 1
diff --git a/usr.bin/ranlib/ranlib.5 b/usr.bin/ranlib/ranlib.5
index 8f7ec14d122..668ef88c30d 100644
--- a/usr.bin/ranlib/ranlib.5
+++ b/usr.bin/ranlib/ranlib.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ranlib.5.5	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt RANLIB 5
diff --git a/usr.bin/ranlib/ranlib.c b/usr.bin/ranlib/ranlib.c
index 0b60eb1c68c..40263318e6a 100644
--- a/usr.bin/ranlib/ranlib.c
+++ b/usr.bin/ranlib/ranlib.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ranlib.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/ranlib/touch.c b/usr.bin/ranlib/touch.c
index bfb10f72761..b062e087c4f 100644
--- a/usr.bin/ranlib/touch.c
+++ b/usr.bin/ranlib/touch.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)touch.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: touch.c,v 1.4 1997/08/04 06:48:25 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/rdist/Makefile b/usr.bin/rdist/Makefile
index 9aae1195847..ea47411d40a 100644
--- a/usr.bin/rdist/Makefile
+++ b/usr.bin/rdist/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.3 (Berkeley) 7/19/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	rdist
 SRCS=	docmd.c expand.c gram.y lookup.c main.c rshrcmd.c server.c
diff --git a/usr.bin/rdist/docmd.c b/usr.bin/rdist/docmd.c
index 2da37c6efd0..7ea9a8c1103 100644
--- a/usr.bin/rdist/docmd.c
+++ b/usr.bin/rdist/docmd.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "From: @(#)docmd.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/rdist/expand.c b/usr.bin/rdist/expand.c
index 83178d00aec..d5f7ed4fd8a 100644
--- a/usr.bin/rdist/expand.c
+++ b/usr.bin/rdist/expand.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)expand.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id: expand.c,v 1.6 1998/04/06 06:18:20 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/rdist/gram.y b/usr.bin/rdist/gram.y
index 4040f948a20..bd77901726d 100644
--- a/usr.bin/rdist/gram.y
+++ b/usr.bin/rdist/gram.y
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)gram.y	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/rdist/lookup.c b/usr.bin/rdist/lookup.c
index acf4bae4fc5..b97ce3f5bf7 100644
--- a/usr.bin/rdist/lookup.c
+++ b/usr.bin/rdist/lookup.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)lookup.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id: lookup.c,v 1.4 1998/04/06 06:18:25 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/rdist/main.c b/usr.bin/rdist/main.c
index c6ab940e9b8..d4d94a2219b 100644
--- a/usr.bin/rdist/main.c
+++ b/usr.bin/rdist/main.c
@@ -39,7 +39,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.3 1997/08/05 06:41:26 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/rdist/rdist.1 b/usr.bin/rdist/rdist.1
index b66b5aca254..9e265b00130 100644
--- a/usr.bin/rdist/rdist.1
+++ b/usr.bin/rdist/rdist.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rdist.1	8.3 (Berkeley) 3/17/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd March 17, 1994
 .Dt RDIST 1
diff --git a/usr.bin/rdist/rshrcmd.c b/usr.bin/rdist/rshrcmd.c
index 306ef05fe6f..c747cc6cf5e 100644
--- a/usr.bin/rdist/rshrcmd.c
+++ b/usr.bin/rdist/rshrcmd.c
@@ -6,7 +6,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include	"defs.h"
diff --git a/usr.bin/rdist/server.c b/usr.bin/rdist/server.c
index d91d723084b..44c2610fa11 100644
--- a/usr.bin/rdist/server.c
+++ b/usr.bin/rdist/server.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)server.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id: server.c,v 1.8 1998/04/20 06:20:24 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/wait.h>
diff --git a/usr.bin/renice/renice.8 b/usr.bin/renice/renice.8
index 1e99fceeb5a..09ddf5bb9fb 100644
--- a/usr.bin/renice/renice.8
+++ b/usr.bin/renice/renice.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)renice.8	8.1 (Berkeley) 6/9/93
-.\"     $Id: renice.8,v 1.3 1999/07/12 20:23:54 nik Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt RENICE 8
diff --git a/usr.bin/renice/renice.c b/usr.bin/renice/renice.c
index 5962ed1707e..baed30a8b58 100644
--- a/usr.bin/renice/renice.c
+++ b/usr.bin/renice/renice.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)renice.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/rev/rev.1 b/usr.bin/rev/rev.1
index f112ac5976f..5f15501512b 100644
--- a/usr.bin/rev/rev.1
+++ b/usr.bin/rev/rev.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rev.1	8.1 (Berkeley) 6/9/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt REV 1
diff --git a/usr.bin/rlogin/Makefile b/usr.bin/rlogin/Makefile
index e5ca71f07b8..2f2fef112f4 100644
--- a/usr.bin/rlogin/Makefile
+++ b/usr.bin/rlogin/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-#	$Id: Makefile,v 1.12 1998/09/19 22:42:05 obrien Exp $
+# $FreeBSD$
 
 PROG=	rlogin
 SRCS=	rlogin.c
diff --git a/usr.bin/rlogin/rlogin.1 b/usr.bin/rlogin/rlogin.1
index e24234bdaab..d95e642394c 100644
--- a/usr.bin/rlogin/rlogin.1
+++ b/usr.bin/rlogin/rlogin.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rlogin.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt RLOGIN 1
diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c
index fd8793b4126..0df97a34bcf 100644
--- a/usr.bin/rlogin/rlogin.c
+++ b/usr.bin/rlogin/rlogin.c
@@ -40,7 +40,7 @@ static const char copyright[] =
 #ifndef lint
 static const char sccsid[] = "@(#)rlogin.c	8.1 (Berkeley) 6/6/93";
 static const char rcsid[] =
-	"$Id: rlogin.c,v 1.19 1999/05/25 11:14:33 peter Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c
index 4fc6684325c..cf783040f80 100644
--- a/usr.bin/rpcgen/rpc_cout.c
+++ b/usr.bin/rpcgen/rpc_cout.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI";
 #endif
 static const char rcsid[] =
-	"$Id: rpc_cout.c,v 1.5 1997/08/06 06:47:39 charnier Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c
index b6d7b2c8169..9224dbbc983 100644
--- a/usr.bin/rpcgen/rpc_main.c
+++ b/usr.bin/rpcgen/rpc_main.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI";
 #endif
 static const char rcsid[] =
-	"$Id: rpc_main.c,v 1.9 1998/03/07 05:43:59 jb Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/usr.bin/rpcgen/rpc_tblout.c b/usr.bin/rpcgen/rpc_tblout.c
index 00b5561e768..45282c87418 100644
--- a/usr.bin/rpcgen/rpc_tblout.c
+++ b/usr.bin/rpcgen/rpc_tblout.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)rpc_tblout.c 1.4 89/02/22 (C) 1988 SMI";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/usr.bin/rpcgen/rpc_util.c b/usr.bin/rpcgen/rpc_util.c
index 175cf29fb3f..75583a58659 100644
--- a/usr.bin/rpcgen/rpc_util.c
+++ b/usr.bin/rpcgen/rpc_util.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)rpc_util.c 1.11 89/02/22 (C) 1987 SMI";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/usr.bin/rpcgen/rpcgen.1 b/usr.bin/rpcgen/rpcgen.1
index a4e1150d735..7c9abed8f8b 100644
--- a/usr.bin/rpcgen/rpcgen.1
+++ b/usr.bin/rpcgen/rpcgen.1
@@ -1,5 +1,5 @@
 .\" @(#)rpcgen.1 1.35 93/06/02 SMI
-.\" $Id$
+.\" $FreeBSD$
 .\" Copyright 1985-1993 Sun Microsystems, Inc.
 .Dd March 28, 1993
 .Dt RPCGEN 1
diff --git a/usr.bin/rpcinfo/Makefile b/usr.bin/rpcinfo/Makefile
index f9377c6dbd1..045c37cf118 100644
--- a/usr.bin/rpcinfo/Makefile
+++ b/usr.bin/rpcinfo/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.2 (Berkeley) 5/11/90
-#	$Id$
+# $FreeBSD$
 
 PROG=	rpcinfo
 MAN8 = rpcinfo.8
diff --git a/usr.bin/rpcinfo/rpcinfo.8 b/usr.bin/rpcinfo/rpcinfo.8
index 1b6a1bb6dbf..e3fb914fcd0 100644
--- a/usr.bin/rpcinfo/rpcinfo.8
+++ b/usr.bin/rpcinfo/rpcinfo.8
@@ -1,5 +1,5 @@
 .\"	from: @(#)rpcinfo.8c	2.2 88/08/03 4.0 RPCSRC; from 1.24 88/02/25 SMI
-.\"	$Id: rpcinfo.8,v 1.3 1997/02/22 19:56:44 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 17, 1987
 .Dt RPCINFO 8
diff --git a/usr.bin/rpcinfo/rpcinfo.c b/usr.bin/rpcinfo/rpcinfo.c
index 4b77f34c47b..99089bb2f30 100644
--- a/usr.bin/rpcinfo/rpcinfo.c
+++ b/usr.bin/rpcinfo/rpcinfo.c
@@ -2,7 +2,7 @@
 /*static char sccsid[] = "from: @(#)rpcinfo.c 1.22 87/08/12 SMI";*/
 /*static char sccsid[] = "from: @(#)rpcinfo.c	2.2 88/08/11 4.0 RPCSRC";*/
 static char rcsid[] =
-	"$Id: rpcinfo.c,v 1.7 1998/06/09 04:30:56 imp Exp $";
+  "$FreeBSD$";
 #endif
 
 /*
diff --git a/usr.bin/rs/rs.1 b/usr.bin/rs/rs.1
index a500d3f63dd..d21bde35448 100644
--- a/usr.bin/rs/rs.1
+++ b/usr.bin/rs/rs.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rs.1	8.2 (Berkeley) 12/30/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt RS 1
diff --git a/usr.bin/rs/rs.c b/usr.bin/rs/rs.c
index b495a8f630c..bd7dc33dcce 100644
--- a/usr.bin/rs/rs.c
+++ b/usr.bin/rs/rs.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)rs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: rs.c,v 1.3 1997/08/07 06:42:37 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/rsh/Makefile b/usr.bin/rsh/Makefile
index 5d545f94fdb..6b102f4dc95 100644
--- a/usr.bin/rsh/Makefile
+++ b/usr.bin/rsh/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-#	$Id: Makefile,v 1.8 1998/09/19 22:42:05 obrien Exp $
+# $FreeBSD$
 
 PROG=	rsh
 SRCS=	rsh.c
diff --git a/usr.bin/rsh/rsh.1 b/usr.bin/rsh/rsh.1
index 291fd099d1c..836d830d63d 100644
--- a/usr.bin/rsh/rsh.1
+++ b/usr.bin/rsh/rsh.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rsh.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt RSH 1
diff --git a/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c
index 13f3c2163b8..deea9d94990 100644
--- a/usr.bin/rsh/rsh.c
+++ b/usr.bin/rsh/rsh.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "From: @(#)rsh.c	8.3 (Berkeley) 4/6/94";
 #endif
 static const char rcsid[] =
-	"$Id: rsh.c,v 1.16 1998/10/09 06:47:57 markm Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/rup/Makefile b/usr.bin/rup/Makefile
index ab50a8a88f4..2e67e374bfa 100644
--- a/usr.bin/rup/Makefile
+++ b/usr.bin/rup/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	rup
 MAN1=	rup.1
diff --git a/usr.bin/rup/rup.1 b/usr.bin/rup/rup.1
index b19041548d7..f7e83d715d1 100644
--- a/usr.bin/rup/rup.1
+++ b/usr.bin/rup/rup.1
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: rup.1,v 1.5 1997/02/22 19:56:48 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 7, 1993
 .Dt RUP 1
diff --git a/usr.bin/rup/rup.c b/usr.bin/rup/rup.c
index 89b6ffb3c1b..b916e9d2344 100644
--- a/usr.bin/rup/rup.c
+++ b/usr.bin/rup/rup.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: rup.c,v 1.9 1997/09/15 09:46:42 jkh Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/ruptime/ruptime.1 b/usr.bin/ruptime/ruptime.1
index 2d8de0d22a5..175856aa3bd 100644
--- a/usr.bin/ruptime/ruptime.1
+++ b/usr.bin/ruptime/ruptime.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ruptime.1	8.2 (Berkeley) 4/5/94
-.\"	$Id: ruptime.1,v 1.5 1999/08/14 01:04:10 chris Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 5, 1994
 .Dt RUPTIME 1
diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c
index e075d920c5b..ab275b901bb 100644
--- a/usr.bin/ruptime/ruptime.c
+++ b/usr.bin/ruptime/ruptime.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: ruptime.c,v 1.10 1997/03/29 04:32:02 imp Exp $ */
+/* $FreeBSD$ */
 
 #ifndef lint
 static char copyright[] =
diff --git a/usr.bin/rusers/Makefile b/usr.bin/rusers/Makefile
index a6b753ff4e5..6ec50ab8ea5 100644
--- a/usr.bin/rusers/Makefile
+++ b/usr.bin/rusers/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG = rusers
 MAN1 = rusers.1
diff --git a/usr.bin/rusers/rusers.1 b/usr.bin/rusers/rusers.1
index 424971e3b03..05044f57816 100644
--- a/usr.bin/rusers/rusers.1
+++ b/usr.bin/rusers/rusers.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)rusers.1	6.7 (Berkeley) 4/23/91
-.\"	$Id: rusers.1,v 1.5 1997/02/22 19:56:52 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 23, 1991
 .Dt RUSERS 1
diff --git a/usr.bin/rusers/rusers.c b/usr.bin/rusers/rusers.c
index 2ac8837aa2e..a59abd62872 100644
--- a/usr.bin/rusers/rusers.c
+++ b/usr.bin/rusers/rusers.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: rusers.c,v 1.6 1997/08/08 12:12:54 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/rwall/Makefile b/usr.bin/rwall/Makefile
index e81c30aafaf..33a2dcc6b63 100644
--- a/usr.bin/rwall/Makefile
+++ b/usr.bin/rwall/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG = rwall
 MAN1 = rwall.1
diff --git a/usr.bin/rwall/rwall.1 b/usr.bin/rwall/rwall.1
index d7265a05852..abdcda5b5bb 100644
--- a/usr.bin/rwall/rwall.1
+++ b/usr.bin/rwall/rwall.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)rwall.1	6.7 (Berkeley) 4/23/91
-.\"	$Id: rwall.1,v 1.4 1997/02/22 19:56:55 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 23, 1991
 .Dt RWALL 1
diff --git a/usr.bin/rwall/rwall.c b/usr.bin/rwall/rwall.c
index a39e478a884..214a5a59236 100644
--- a/usr.bin/rwall/rwall.c
+++ b/usr.bin/rwall/rwall.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "from: @(#)wall.c	5.14 (Berkeley) 3/2/91";
 #endif
 static const char rcsid[] =
-	"$Id: rwall.c,v 1.6 1997/08/08 12:18:16 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/rwho/rwho.1 b/usr.bin/rwho/rwho.1
index edd0288f4d7..3568c2d2287 100644
--- a/usr.bin/rwho/rwho.1
+++ b/usr.bin/rwho/rwho.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)rwho.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt RWHO 1
diff --git a/usr.bin/rwho/rwho.c b/usr.bin/rwho/rwho.c
index 2a6a7ab483e..c9045f1f9e2 100644
--- a/usr.bin/rwho/rwho.c
+++ b/usr.bin/rwho/rwho.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)rwho.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: rwho.c,v 1.11 1997/08/08 12:20:24 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/sasc/sasc.1 b/usr.bin/sasc/sasc.1
index 325f6fd4532..cf5635ecd84 100644
--- a/usr.bin/sasc/sasc.1
+++ b/usr.bin/sasc/sasc.1
@@ -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: sasc.1,v 1.6 1997/08/08 12:22:29 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 6, 1995
 .Dt SASC 1
diff --git a/usr.bin/sasc/sasc.c b/usr.bin/sasc/sasc.c
index e811abfd917..3b023ea8eaa 100644
--- a/usr.bin/sasc/sasc.c
+++ b/usr.bin/sasc/sasc.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/script/script.1 b/usr.bin/script/script.1
index 277c5f7f1bc..ac00cb1d29a 100644
--- a/usr.bin/script/script.1
+++ b/usr.bin/script/script.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)script.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: script.1,v 1.5 1998/06/04 21:06:02 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt SCRIPT 1
diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c
index c4f3e917dee..708a59b68e6 100644
--- a/usr.bin/script/script.c
+++ b/usr.bin/script/script.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)script.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: script.c,v 1.9 1998/09/19 09:45:42 des Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/sed/compile.c b/usr.bin/sed/compile.c
index 1313fcaec0f..136f56ce119 100644
--- a/usr.bin/sed/compile.c
+++ b/usr.bin/sed/compile.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)compile.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: compile.c,v 1.11 1998/12/07 05:35:54 archie Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c
index 353dedbc8e3..88f4ea52b3e 100644
--- a/usr.bin/sed/main.c
+++ b/usr.bin/sed/main.c
@@ -46,7 +46,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.2 (Berkeley) 1/3/94";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.7 1997/08/11 07:21:03 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/sed/misc.c b/usr.bin/sed/misc.c
index 237f67a3f50..c9b013a8dbd 100644
--- a/usr.bin/sed/misc.c
+++ b/usr.bin/sed/misc.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/sed/process.c b/usr.bin/sed/process.c
index cf0edbef809..77ef93a58d9 100644
--- a/usr.bin/sed/process.c
+++ b/usr.bin/sed/process.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)process.c	8.6 (Berkeley) 4/20/94";
 #endif
 static const char rcsid[] =
-	"$Id: process.c,v 1.8 1998/12/07 05:33:39 archie Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index eb20cb04710..96d94c5dc34 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sed.1	8.2 (Berkeley) 12/30/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt SED 1
diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1
index da59e14d98a..795d939c58d 100644
--- a/usr.bin/shar/shar.1
+++ b/usr.bin/shar/shar.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)shar.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: shar.1,v 1.5 1997/04/27 08:45:46 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt SHAR 1
diff --git a/usr.bin/showmount/showmount.8 b/usr.bin/showmount/showmount.8
index 386efa0aab5..c2aae048439 100644
--- a/usr.bin/showmount/showmount.8
+++ b/usr.bin/showmount/showmount.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)showmount.8	8.3 (Berkeley) 3/29/95
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd March 29, 1995
 .Dt SHOWMOUNT 8
diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c
index 08d7d5023f2..ecc528d8e6e 100644
--- a/usr.bin/showmount/showmount.c
+++ b/usr.bin/showmount/showmount.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)showmount.c	8.3 (Berkeley) 3/29/95";
 #endif
 static const char rcsid[] =
-	"$Id: showmount.c,v 1.6 1997/08/11 07:27:27 charnier Exp $";
+  "$FreeBSD$";
 #endif not lint
 
 #include <sys/types.h>
diff --git a/usr.bin/size/size.1 b/usr.bin/size/size.1
index 24341dbaad1..1cd1f9f7bec 100644
--- a/usr.bin/size/size.1
+++ b/usr.bin/size/size.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)size.1	8.2 (Berkeley) 4/18/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt SIZE 1
diff --git a/usr.bin/size/size.c b/usr.bin/size/size.c
index 69322d34b05..b42e975da34 100644
--- a/usr.bin/size/size.c
+++ b/usr.bin/size/size.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)size.c	8.2 (Berkeley) 12/9/93";
 #endif
 static const char rcsid[] =
-	"$Id: size.c,v 1.3 1997/08/11 07:28:19 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/sockstat/Makefile b/usr.bin/sockstat/Makefile
index eafc337e1d5..a72aadfe8ba 100644
--- a/usr.bin/sockstat/Makefile
+++ b/usr.bin/sockstat/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1 1999/04/14 16:17:34 des Exp $
+# $FreeBSD$
 
 MAINTAINER=	des@freebsd.org
 MAN1=		sockstat.1
diff --git a/usr.bin/sockstat/sockstat.1 b/usr.bin/sockstat/sockstat.1
index d009bf93dfd..b9b810bfb2f 100644
--- a/usr.bin/sockstat/sockstat.1
+++ b/usr.bin/sockstat/sockstat.1
@@ -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: sockstat.1,v 1.1 1999/04/15 13:40:43 des Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 13, 1999
 .Dt LSOCK 1
diff --git a/usr.bin/sockstat/sockstat.pl b/usr.bin/sockstat/sockstat.pl
index 9d9261c27f1..3c251884cb4 100644
--- a/usr.bin/sockstat/sockstat.pl
+++ b/usr.bin/sockstat/sockstat.pl
@@ -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: sockstat.pl,v 1.2 1999/05/01 11:31:19 des Exp $
+# $FreeBSD$
 #
 
 my (%myaddr, %hisaddr);
diff --git a/usr.bin/soelim/soelim.1 b/usr.bin/soelim/soelim.1
index aa5bf4d1c79..2c8c835d7c9 100644
--- a/usr.bin/soelim/soelim.1
+++ b/usr.bin/soelim/soelim.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)soelim.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt SOELIM 1
diff --git a/usr.bin/soelim/soelim.c b/usr.bin/soelim/soelim.c
index 635088a0a7c..9152a2791b4 100644
--- a/usr.bin/soelim/soelim.c
+++ b/usr.bin/soelim/soelim.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)soelim.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/split/split.1 b/usr.bin/split/split.1
index 927250c26ff..12759bf0de6 100644
--- a/usr.bin/split/split.1
+++ b/usr.bin/split/split.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)split.1	8.3 (Berkeley) 4/16/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 16, 1994
 .Dt SPLIT 1
diff --git a/usr.bin/strings/strings.1 b/usr.bin/strings/strings.1
index d644237ffaf..df660b0c333 100644
--- a/usr.bin/strings/strings.1
+++ b/usr.bin/strings/strings.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strings.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt STRINGS 1
diff --git a/usr.bin/strings/strings.c b/usr.bin/strings/strings.c
index 80011677c3f..6a49d632035 100644
--- a/usr.bin/strings/strings.c
+++ b/usr.bin/strings/strings.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)strings.c	8.2 (Berkeley) 1/28/94";
 #endif
 static const char rcsid[] =
-	"$Id: strings.c,v 1.6 1997/08/11 07:31:28 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/strip/strip.1 b/usr.bin/strip/strip.1
index de225ab4832..e91d6d9ada3 100644
--- a/usr.bin/strip/strip.1
+++ b/usr.bin/strip/strip.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strip.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: strip.1,v 1.5 1997/02/22 19:57:13 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt STRIP 1
diff --git a/usr.bin/strip/strip.1aout b/usr.bin/strip/strip.1aout
index de225ab4832..e91d6d9ada3 100644
--- a/usr.bin/strip/strip.1aout
+++ b/usr.bin/strip/strip.1aout
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)strip.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: strip.1,v 1.5 1997/02/22 19:57:13 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt STRIP 1
diff --git a/usr.bin/strip/strip.c b/usr.bin/strip/strip.c
index 7baf965d14b..03ba76c6baa 100644
--- a/usr.bin/strip/strip.c
+++ b/usr.bin/strip/strip.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)strip.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: strip.c,v 1.10 1997/03/29 04:32:36 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile
index 2ffba8c8514..33064a4e089 100644
--- a/usr.bin/su/Makefile
+++ b/usr.bin/su/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-#	$Id: Makefile,v 1.22 1999/08/13 16:51:40 sheldonh Exp $
+# $FreeBSD$
 
 PROG=	su
 SRCS=	su.c
diff --git a/usr.bin/su/su.1 b/usr.bin/su/su.1
index 78ce5f15bd1..c7a05977a35 100644
--- a/usr.bin/su/su.1
+++ b/usr.bin/su/su.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)su.1	8.2 (Berkeley) 4/18/94
-.\"	$Id: su.1,v 1.14 1998/06/08 05:29:51 jkoshy Exp $
+.\" $FreeBSD$
 .\"
 .\" this is for hilit19's braindeadness: "
 .Dd April 18, 1994
diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c
index 72ace265663..2e5651e9bfc 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)su.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: su.c,v 1.31 1999/07/02 11:20:59 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/symorder/symorder.1 b/usr.bin/symorder/symorder.1
index 9769490e014..51cd83b6d33 100644
--- a/usr.bin/symorder/symorder.1
+++ b/usr.bin/symorder/symorder.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)symorder.1	6.5 (Berkeley) 4/22/91
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 22, 1991
 .Dt SYMORDER 1
diff --git a/usr.bin/symorder/symorder.c b/usr.bin/symorder/symorder.c
index 91302292ea1..503c67eca60 100644
--- a/usr.bin/symorder/symorder.c
+++ b/usr.bin/symorder/symorder.c
@@ -42,7 +42,7 @@ char const copyright[] =
 static char sccsid[] = "@(#)symorder.c	5.8 (Berkeley) 4/1/91";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/systat/cmds.c b/usr.bin/systat/cmds.c
index bbdb58e6a83..e15d7e28a50 100644
--- a/usr.bin/systat/cmds.c
+++ b/usr.bin/systat/cmds.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmds.c	8.2 (Berkeley) 4/29/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/usr.bin/systat/cmdtab.c b/usr.bin/systat/cmdtab.c
index 83b5b02476a..ffb0259d474 100644
--- a/usr.bin/systat/cmdtab.c
+++ b/usr.bin/systat/cmdtab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
 */
 static const char rcsid[] =
-	"$Id: cmdtab.c,v 1.3 1997/09/25 00:37:31 wollman Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "systat.h"
diff --git a/usr.bin/systat/devs.c b/usr.bin/systat/devs.c
index ac13b768e11..6f9c8117063 100644
--- a/usr.bin/systat/devs.c
+++ b/usr.bin/systat/devs.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: devs.c,v 1.2 1998/09/20 00:11:23 ken Exp $
+ * $FreeBSD$
  */
 /*
  * Some code and ideas taken from the old disks.c.
diff --git a/usr.bin/systat/devs.h b/usr.bin/systat/devs.h
index ce49c40d0ab..ec656543b91 100644
--- a/usr.bin/systat/devs.h
+++ b/usr.bin/systat/devs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 int dsinit(int, struct statinfo *, struct statinfo *, struct statinfo *);
diff --git a/usr.bin/systat/icmp.c b/usr.bin/systat/icmp.c
index 458aa84edfc..3b5b8293536 100644
--- a/usr.bin/systat/icmp.c
+++ b/usr.bin/systat/icmp.c
@@ -38,7 +38,7 @@ static const char rcsid[] =
 	"Id: mbufs.c,v 1.5 1997/02/24 20:59:03 wollman Exp";
 */
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c
index 21d4424e151..b499a8b2104 100644
--- a/usr.bin/systat/iostat.c
+++ b/usr.bin/systat/iostat.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iostat.c,v 1.6 1998/09/15 08:16:40 gibbs Exp $
+ * $FreeBSD$
  */
 /*
  * Copyright (c) 1980, 1992, 1993
diff --git a/usr.bin/systat/ip.c b/usr.bin/systat/ip.c
index 4501af17791..d54c76ddb41 100644
--- a/usr.bin/systat/ip.c
+++ b/usr.bin/systat/ip.c
@@ -38,7 +38,7 @@ static const char rcsid[] =
 	"Id: mbufs.c,v 1.5 1997/02/24 20:59:03 wollman Exp";
 */
 static const char rcsid[] =
-	"$Id: ip.c,v 1.1 1997/09/25 00:37:32 wollman Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c
index 44310948040..8454682e8eb 100644
--- a/usr.bin/systat/main.c
+++ b/usr.bin/systat/main.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.9 1998/07/06 22:07:58 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/systat/mbufs.c b/usr.bin/systat/mbufs.c
index 389e143e966..f542da99e72 100644
--- a/usr.bin/systat/mbufs.c
+++ b/usr.bin/systat/mbufs.c
@@ -34,7 +34,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
 static const char rcsid[] =
-	"$Id: mbufs.c,v 1.7 1998/06/09 04:17:21 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/systat/mode.c b/usr.bin/systat/mode.c
index 17d79b00df4..3eb85c033f1 100644
--- a/usr.bin/systat/mode.c
+++ b/usr.bin/systat/mode.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/usr.bin/systat/mode.h b/usr.bin/systat/mode.h
index 586ecb1f11f..caa6bae7e24 100644
--- a/usr.bin/systat/mode.h
+++ b/usr.bin/systat/mode.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 /*
diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c
index 479b33673eb..b5d0422143a 100644
--- a/usr.bin/systat/netcmds.c
+++ b/usr.bin/systat/netcmds.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)netcmds.c	8.1 (Berkeley) 6/6/93";
 */
 static const char rcsid[] =
-	"$Id: netcmds.c,v 1.7 1997/12/04 03:44:44 steve Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c
index 227f210711e..ba53fdae58a 100644
--- a/usr.bin/systat/netstat.c
+++ b/usr.bin/systat/netstat.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)netstat.c	8.1 (Berkeley) 6/6/93";
 */
 static const char rcsid[] =
-	"$Id: netstat.c,v 1.10 1998/06/12 14:15:24 peter Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/systat/swap.c b/usr.bin/systat/swap.c
index fa323b00599..eda7b91f120 100644
--- a/usr.bin/systat/swap.c
+++ b/usr.bin/systat/swap.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)swap.c	8.3 (Berkeley) 4/29/95";
 #endif
 static const char rcsid[] =
-	"$Id: swap.c,v 1.10 1999/02/06 06:43:56 dillon Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index c39031b8074..cbbd77b748c 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)systat.1	8.2 (Berkeley) 12/30/93
-.\"	$Id: systat.1,v 1.19 1999/07/30 07:44:25 des Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 9, 1997
 .Dt SYSTAT 1
diff --git a/usr.bin/systat/systat.h b/usr.bin/systat/systat.h
index 72f0f284fdf..d8045d8fecf 100644
--- a/usr.bin/systat/systat.h
+++ b/usr.bin/systat/systat.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)systat.h	8.1 (Berkeley) 6/6/93
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <curses.h>
diff --git a/usr.bin/systat/tcp.c b/usr.bin/systat/tcp.c
index e0edbe1c199..433721ec187 100644
--- a/usr.bin/systat/tcp.c
+++ b/usr.bin/systat/tcp.c
@@ -38,7 +38,7 @@ static const char rcsid[] =
 	"Id: mbufs.c,v 1.5 1997/02/24 20:59:03 wollman Exp";
 */
 static const char rcsid[] =
-	"$Id: tcp.c,v 1.1 1997/09/27 00:44:55 wollman Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index d3b5a68d322..184c7e66152 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 1/12/94";
 #endif
 static const char rcsid[] =
-	"$Id: vmstat.c,v 1.35 1999/03/22 03:44:01 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tail/reverse.c b/usr.bin/tail/reverse.c
index 6efe193aed3..7acf4506372 100644
--- a/usr.bin/tail/reverse.c
+++ b/usr.bin/tail/reverse.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)reverse.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: reverse.c,v 1.7 1997/08/13 06:46:56 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/tail/tail.1 b/usr.bin/tail/tail.1
index 39864d09c68..8ffb8b7c868 100644
--- a/usr.bin/tail/tail.1
+++ b/usr.bin/tail/tail.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tail.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt TAIL 1
diff --git a/usr.bin/talk/Makefile b/usr.bin/talk/Makefile
index 921a12e168a..bddde1ba259 100644
--- a/usr.bin/talk/Makefile
+++ b/usr.bin/talk/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	talk
 DPADD=	${LIBCURSES} ${LIBTERMCAP}
diff --git a/usr.bin/talk/ctl.c b/usr.bin/talk/ctl.c
index f4cdcd111f4..c8094b47c51 100644
--- a/usr.bin/talk/ctl.c
+++ b/usr.bin/talk/ctl.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)ctl.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: ctl.c,v 1.4 1998/01/14 07:20:59 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/talk/ctl_transact.c b/usr.bin/talk/ctl_transact.c
index 2f2d8430bbb..fa3ebad7a5c 100644
--- a/usr.bin/talk/ctl_transact.c
+++ b/usr.bin/talk/ctl_transact.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)ctl_transact.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.bin/talk/display.c b/usr.bin/talk/display.c
index 8dbd7583d38..16c7605d447 100644
--- a/usr.bin/talk/display.c
+++ b/usr.bin/talk/display.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)display.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/talk/get_addrs.c b/usr.bin/talk/get_addrs.c
index 641f80fa323..871dc9ac786 100644
--- a/usr.bin/talk/get_addrs.c
+++ b/usr.bin/talk/get_addrs.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)get_addrs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/talk/get_iface.c b/usr.bin/talk/get_iface.c
index 1d303e8dd03..05a8368e6b1 100644
--- a/usr.bin/talk/get_iface.c
+++ b/usr.bin/talk/get_iface.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: get_iface.c,v 1.5 1998/01/14 07:21:03 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.bin/talk/get_names.c b/usr.bin/talk/get_names.c
index 762f4ff8370..73e20a162bd 100644
--- a/usr.bin/talk/get_names.c
+++ b/usr.bin/talk/get_names.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)get_names.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/talk/init_disp.c b/usr.bin/talk/init_disp.c
index c5cd612a474..b752e0aa492 100644
--- a/usr.bin/talk/init_disp.c
+++ b/usr.bin/talk/init_disp.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)init_disp.c	8.2 (Berkeley) 2/16/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/talk/invite.c b/usr.bin/talk/invite.c
index a788d43bd00..f941c8dde78 100644
--- a/usr.bin/talk/invite.c
+++ b/usr.bin/talk/invite.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)invite.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/talk/io.c b/usr.bin/talk/io.c
index 4770d5b0c3a..9653e1b11d7 100644
--- a/usr.bin/talk/io.c
+++ b/usr.bin/talk/io.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)io.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: io.c,v 1.6 1998/01/14 07:21:10 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/talk/look_up.c b/usr.bin/talk/look_up.c
index fad2e391d2a..3c6f3edc276 100644
--- a/usr.bin/talk/look_up.c
+++ b/usr.bin/talk/look_up.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)look_up.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.bin/talk/msgs.c b/usr.bin/talk/msgs.c
index ea956088768..82c5038fc44 100644
--- a/usr.bin/talk/msgs.c
+++ b/usr.bin/talk/msgs.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)msgs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/talk/talk.1 b/usr.bin/talk/talk.1
index 8226e9df554..64bf639f86c 100644
--- a/usr.bin/talk/talk.1
+++ b/usr.bin/talk/talk.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)talk.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt TALK 1
diff --git a/usr.bin/talk/talk.c b/usr.bin/talk/talk.c
index 09b6c753f1e..d71d49ae2b7 100644
--- a/usr.bin/talk/talk.c
+++ b/usr.bin/talk/talk.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)talk.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "talk.h"
diff --git a/usr.bin/tconv/Makefile b/usr.bin/tconv/Makefile
index 0a4af30bbe3..403397f67e4 100644
--- a/usr.bin/tconv/Makefile
+++ b/usr.bin/tconv/Makefile
@@ -1,5 +1,5 @@
 # Makefile for tconv
-# $Id$
+# $FreeBSD$
 
 PROG=   tconv
 SRCS=   tconv.c quit.c
diff --git a/usr.bin/tconv/tconv.1 b/usr.bin/tconv/tconv.1
index 1a6d0c5bf65..2cfa9c10098 100644
--- a/usr.bin/tconv/tconv.1
+++ b/usr.bin/tconv/tconv.1
@@ -1,5 +1,5 @@
 .\" @(#) mytinfo tconv.1 3.2 92/02/01 public domain, By Ross Ridge
-.\" $Id: tconv.1,v 1.8 1997/08/13 06:58:44 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 1, 1992
 .Dt TCONV 1
diff --git a/usr.bin/tconv/tconv.c b/usr.bin/tconv/tconv.c
index 5beeb1becc5..a9d035d028d 100644
--- a/usr.bin/tconv/tconv.c
+++ b/usr.bin/tconv/tconv.c
@@ -58,7 +58,7 @@
 static const char SCCSid[] =
 	"@(#) mytinfo tconv.c 3.2 92/02/01 public domain, By Ross Ridge";
 static const char rcsid[] =
-	"$Id: tconv.c,v 1.3 1997/08/13 06:58:45 charnier Exp $";
+  "$FreeBSD$";
 #endif
 
 /* the right margin of the output */
diff --git a/usr.bin/tcopy/tcopy.1 b/usr.bin/tcopy/tcopy.1
index 9155207375f..85a344eed2f 100644
--- a/usr.bin/tcopy/tcopy.1
+++ b/usr.bin/tcopy/tcopy.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tcopy.1	8.2 (Berkeley) 4/17/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 17, 1994
 .Dt TCOPY 1
diff --git a/usr.bin/tcopy/tcopy.c b/usr.bin/tcopy/tcopy.c
index 3b9ffdd81a5..18be38f28c1 100644
--- a/usr.bin/tcopy/tcopy.c
+++ b/usr.bin/tcopy/tcopy.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tcopy.c	8.2 (Berkeley) 4/17/94";
 #endif
 static const char rcsid[] =
-	"$Id: tcopy.c,v 1.5 1999/04/30 13:13:32 phk Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tee/tee.1 b/usr.bin/tee/tee.1
index 271afde5907..adacd0764ff 100644
--- a/usr.bin/tee/tee.1
+++ b/usr.bin/tee/tee.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tee.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt TEE 1
diff --git a/usr.bin/tee/tee.c b/usr.bin/tee/tee.c
index d844c5b00ba..c393200780c 100644
--- a/usr.bin/tee/tee.c
+++ b/usr.bin/tee/tee.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tee.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1
index 7091304b46f..ca2e968be6f 100644
--- a/usr.bin/telnet/telnet.1
+++ b/usr.bin/telnet/telnet.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)telnet.1	8.5 (Berkeley) 3/1/94
-.\"	$Id: telnet.1,v 1.12 1999/06/17 07:12:39 ru Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 1, 1994
 .Dt TELNET 1
diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c
index 3c6a15116d4..4ae5dc4c11c 100644
--- a/usr.bin/tftp/main.c
+++ b/usr.bin/tftp/main.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.6 1998/06/09 04:31:02 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
diff --git a/usr.bin/tftp/tftp.1 b/usr.bin/tftp/tftp.1
index 85ab1af5215..0f87f58f39c 100644
--- a/usr.bin/tftp/tftp.1
+++ b/usr.bin/tftp/tftp.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tftp.1	8.2 (Berkeley) 4/18/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt TFTP 1
diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c
index ae517a48632..9dc00afeddb 100644
--- a/usr.bin/tftp/tftp.c
+++ b/usr.bin/tftp/tftp.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)tftp.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: tftp.c,v 1.3 1998/02/20 04:30:34 jb Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
diff --git a/usr.bin/tftp/tftpsubs.c b/usr.bin/tftp/tftpsubs.c
index 277d561403e..5f3549d7dcf 100644
--- a/usr.bin/tftp/tftpsubs.c
+++ b/usr.bin/tftp/tftpsubs.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)tftpsubs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /* Simple minded read-ahead/write-behind subroutines for tftp user and
diff --git a/usr.bin/time/time.1 b/usr.bin/time/time.1
index b2b2a50be59..4d29566bfbf 100644
--- a/usr.bin/time/time.1
+++ b/usr.bin/time/time.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)time.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt TIME 1
diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c
index 1400a97e585..960d00e27aa 100644
--- a/usr.bin/time/time.c
+++ b/usr.bin/time/time.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)time.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: time.c,v 1.12 1998/10/13 14:52:32 des Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tip/libacu/acucommon.c b/usr.bin/tip/libacu/acucommon.c
index fe0d146b178..efb644fce7d 100644
--- a/usr.bin/tip/libacu/acucommon.c
+++ b/usr.bin/tip/libacu/acucommon.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)acucommon.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/libacu/unidialer.c b/usr.bin/tip/libacu/unidialer.c
index bac2368c077..0206571007a 100644
--- a/usr.bin/tip/libacu/unidialer.c
+++ b/usr.bin/tip/libacu/unidialer.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)unidialer.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: unidialer.c,v 1.5 1997/08/18 07:15:41 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/libacu/ventel.c b/usr.bin/tip/libacu/ventel.c
index a438b4252e4..08f2be588e6 100644
--- a/usr.bin/tip/libacu/ventel.c
+++ b/usr.bin/tip/libacu/ventel.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)ventel.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/tip/acu.c b/usr.bin/tip/tip/acu.c
index 3f65c554733..3ee0381f946 100644
--- a/usr.bin/tip/tip/acu.c
+++ b/usr.bin/tip/tip/acu.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)acu.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: acu.c,v 1.3 1997/08/18 07:15:58 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/acutab.c b/usr.bin/tip/tip/acutab.c
index cb0dd85a134..2d38c7d3efb 100644
--- a/usr.bin/tip/tip/acutab.c
+++ b/usr.bin/tip/tip/acutab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)acutab.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/cmds.c b/usr.bin/tip/tip/cmds.c
index c605022e87d..f0caf1e648d 100644
--- a/usr.bin/tip/tip/cmds.c
+++ b/usr.bin/tip/tip/cmds.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmds.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: cmds.c,v 1.8 1998/10/03 11:01:39 dfr Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/cmdtab.c b/usr.bin/tip/tip/cmdtab.c
index f9efc7b05dc..3ad19e89afa 100644
--- a/usr.bin/tip/tip/cmdtab.c
+++ b/usr.bin/tip/tip/cmdtab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/cu.c b/usr.bin/tip/tip/cu.c
index 50955fc6a12..2b3b2ed60d4 100644
--- a/usr.bin/tip/tip/cu.c
+++ b/usr.bin/tip/tip/cu.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cu.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: cu.c,v 1.2 1997/08/18 07:16:02 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/hunt.c b/usr.bin/tip/tip/hunt.c
index 0f71ea97fa9..90f7a613ad7 100644
--- a/usr.bin/tip/tip/hunt.c
+++ b/usr.bin/tip/tip/hunt.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)hunt.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tip/tip/log.c b/usr.bin/tip/tip/log.c
index acf5d87e4cd..20004e8aa68 100644
--- a/usr.bin/tip/tip/log.c
+++ b/usr.bin/tip/tip/log.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)log.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: log.c,v 1.2 1997/08/18 07:16:03 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/modems.5 b/usr.bin/tip/tip/modems.5
index 0e74ca2d3df..5fd486699ed 100644
--- a/usr.bin/tip/tip/modems.5
+++ b/usr.bin/tip/tip/modems.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)modems.5	3/24/95
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd March 24, 1995
 .Dt MODEMS 5
diff --git a/usr.bin/tip/tip/partab.c b/usr.bin/tip/tip/partab.c
index c49721e643f..94b2ab195e5 100644
--- a/usr.bin/tip/tip/partab.c
+++ b/usr.bin/tip/tip/partab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)partab.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/tip/remote.c b/usr.bin/tip/tip/remote.c
index 9071eb62028..2bc93438925 100644
--- a/usr.bin/tip/tip/remote.c
+++ b/usr.bin/tip/tip/remote.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)remote.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/syslimits.h>
diff --git a/usr.bin/tip/tip/tip.1 b/usr.bin/tip/tip/tip.1
index 00ebfd7f538..dd9327fe076 100644
--- a/usr.bin/tip/tip/tip.1
+++ b/usr.bin/tip/tip/tip.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tip.1	8.4 (Berkeley) 4/18/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt TIP 1
diff --git a/usr.bin/tip/tip/tip.c b/usr.bin/tip/tip/tip.c
index 124286e6e1f..810c9c6b123 100644
--- a/usr.bin/tip/tip/tip.c
+++ b/usr.bin/tip/tip/tip.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tip.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: tip.c,v 1.9 1998/06/09 14:51:05 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/tip/tipout.c b/usr.bin/tip/tip/tipout.c
index d9417d68602..c9292a870a3 100644
--- a/usr.bin/tip/tip/tipout.c
+++ b/usr.bin/tip/tip/tipout.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)tipout.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: tipout.c,v 1.4 1997/08/18 07:16:08 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "tip.h"
diff --git a/usr.bin/tip/tip/value.c b/usr.bin/tip/tip/value.c
index 52bcfeba1e6..8be5cd9a0db 100644
--- a/usr.bin/tip/tip/value.c
+++ b/usr.bin/tip/tip/value.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)value.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: value.c,v 1.3 1997/08/18 07:16:12 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "tip.h"
diff --git a/usr.bin/tip/tip/vars.c b/usr.bin/tip/tip/vars.c
index 34d604e6d0c..6aba4993e23 100644
--- a/usr.bin/tip/tip/vars.c
+++ b/usr.bin/tip/tip/vars.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)vars.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: vars.c,v 1.2 1997/08/18 07:16:12 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tn3270/api/api_bsd.c b/usr.bin/tn3270/api/api_bsd.c
index 7a884e83a12..0e39a855b0f 100644
--- a/usr.bin/tn3270/api/api_bsd.c
+++ b/usr.bin/tn3270/api/api_bsd.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)api_bsd.c	8.2 (Berkeley) 1/7/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #if	defined(unix)
diff --git a/usr.bin/tn3270/ascii/mset.c b/usr.bin/tn3270/ascii/mset.c
index a26852d27cb..8e344930320 100644
--- a/usr.bin/tn3270/ascii/mset.c
+++ b/usr.bin/tn3270/ascii/mset.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mset.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tn3270/mset/map3270.5 b/usr.bin/tn3270/mset/map3270.5
index 40a49781328..d9249f56319 100644
--- a/usr.bin/tn3270/mset/map3270.5
+++ b/usr.bin/tn3270/mset/map3270.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)map3270.5	8.4 (Berkeley) 6/1/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .TH MAP3270 5  "June 1, 1994"
 .UC 6
diff --git a/usr.bin/tn3270/mset/mset.1 b/usr.bin/tn3270/mset/mset.1
index 362493bd32c..8caa8aa25aa 100644
--- a/usr.bin/tn3270/mset/mset.1
+++ b/usr.bin/tn3270/mset/mset.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mset.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt MSET 1
diff --git a/usr.bin/tn3270/tn3270/tn3270.1 b/usr.bin/tn3270/tn3270/tn3270.1
index 41d795494ee..d1675a782a9 100644
--- a/usr.bin/tn3270/tn3270/tn3270.1
+++ b/usr.bin/tn3270/tn3270/tn3270.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tn3270.1	8.2 (Berkeley) 4/18/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt TN3270 1
diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c
index ee651d03ccc..a3935021d16 100644
--- a/usr.bin/top/machine.c
+++ b/usr.bin/top/machine.c
@@ -19,7 +19,7 @@
  *          Steven Wallace  <swallace@freebsd.org>
  *          Wolfram Schneider <wosch@FreeBSD.org>
  *
- * $Id: machine.c,v 1.25 1999/05/11 14:32:15 peter Exp $
+ * $FreeBSD$
  */
 
 
diff --git a/usr.bin/touch/touch.1 b/usr.bin/touch/touch.1
index dbb33777417..b1583f316f6 100644
--- a/usr.bin/touch/touch.1
+++ b/usr.bin/touch/touch.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)touch.1	8.3 (Berkeley) 4/28/95
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 28, 1995
 .Dt TOUCH 1
diff --git a/usr.bin/tput/tput.1 b/usr.bin/tput/tput.1
index e48f9f57be9..834f49e7858 100644
--- a/usr.bin/tput/tput.1
+++ b/usr.bin/tput/tput.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tput.1	8.2 (Berkeley) 3/19/94
-.\"	$Id: tput.1,v 1.3 1997/04/27 08:45:46 jmg Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 19, 1994
 .Dt TPUT 1
diff --git a/usr.bin/tr/str.c b/usr.bin/tr/str.c
index 55ad1bd448b..ff27e4add3c 100644
--- a/usr.bin/tr/str.c
+++ b/usr.bin/tr/str.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)str.c	8.2 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/tr/tr.1 b/usr.bin/tr/tr.1
index d38ab2a0dad..7403dba1619 100644
--- a/usr.bin/tr/tr.1
+++ b/usr.bin/tr/tr.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tr.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd October 11, 1997
 .Dt TR 1
diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c
index 52ccb1a1c8c..b842e6d3452 100644
--- a/usr.bin/tr/tr.c
+++ b/usr.bin/tr/tr.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tr.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: tr.c,v 1.6 1997/08/18 07:24:58 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <locale.h>
diff --git a/usr.bin/true/true.1 b/usr.bin/true/true.1
index c0bf4d2fade..1eee432284c 100644
--- a/usr.bin/true/true.1
+++ b/usr.bin/true/true.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)true.1	8.1 (Berkeley) 6/9/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt TRUE 1
diff --git a/usr.bin/truss/alpha-fbsd.c b/usr.bin/truss/alpha-fbsd.c
index 09f7394de4e..125e126da9c 100644
--- a/usr.bin/truss/alpha-fbsd.c
+++ b/usr.bin/truss/alpha-fbsd.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: alpha-fbsd.c,v 1.1 1998/10/03 00:43:05 sef Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/amd64-fbsd32.c b/usr.bin/truss/amd64-fbsd32.c
index 3096c82c2bd..463f475cefa 100644
--- a/usr.bin/truss/amd64-fbsd32.c
+++ b/usr.bin/truss/amd64-fbsd32.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: i386-fbsd.c,v 1.5 1998/01/09 09:31:40 sef Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/amd64-linux32.c b/usr.bin/truss/amd64-linux32.c
index 2d334ba0154..ec7632b83e0 100644
--- a/usr.bin/truss/amd64-linux32.c
+++ b/usr.bin/truss/amd64-linux32.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: i386-linux.c,v 1.5 1998/01/09 09:31:42 sef Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/i386-fbsd.c b/usr.bin/truss/i386-fbsd.c
index 3096c82c2bd..463f475cefa 100644
--- a/usr.bin/truss/i386-fbsd.c
+++ b/usr.bin/truss/i386-fbsd.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: i386-fbsd.c,v 1.5 1998/01/09 09:31:40 sef Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/i386-linux.c b/usr.bin/truss/i386-linux.c
index 2d334ba0154..ec7632b83e0 100644
--- a/usr.bin/truss/i386-linux.c
+++ b/usr.bin/truss/i386-linux.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: i386-linux.c,v 1.5 1998/01/09 09:31:42 sef Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/main.c b/usr.bin/truss/main.c
index b82db46c9be..ab5c0bae20d 100644
--- a/usr.bin/truss/main.c
+++ b/usr.bin/truss/main.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: main.c,v 1.12 1998/10/03 00:43:05 sef Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/setup.c b/usr.bin/truss/setup.c
index fbef7e11a30..afa011308e9 100644
--- a/usr.bin/truss/setup.c
+++ b/usr.bin/truss/setup.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: setup.c,v 1.7 1998/01/05 07:30:25 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/syscall.h b/usr.bin/truss/syscall.h
index 5f3757c81ef..2b3c66b5928 100644
--- a/usr.bin/truss/syscall.h
+++ b/usr.bin/truss/syscall.h
@@ -18,7 +18,7 @@
  * IN (meaning that the data is passed *into* the system call).
  */
 /*
- * $Id: syscall.h,v 1.3 1997/12/20 18:40:41 sef Exp $
+ * $FreeBSD$
  */
 
 enum Argtype { None = 1, Hex, Octal, Int, String, Ptr, Stat, Ioctl, Quad,
diff --git a/usr.bin/truss/syscalls.c b/usr.bin/truss/syscalls.c
index 53865fddcb4..bdd087bbf50 100644
--- a/usr.bin/truss/syscalls.c
+++ b/usr.bin/truss/syscalls.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: syscalls.c,v 1.7 1999/08/05 12:03:50 des Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tset/map.c b/usr.bin/tset/map.c
index 056f367c39b..016afb1ff59 100644
--- a/usr.bin/tset/map.c
+++ b/usr.bin/tset/map.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)map.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id: map.c,v 1.4 1997/08/18 07:27:53 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tset/misc.c b/usr.bin/tset/misc.c
index 1e94df18c83..4d8d705a9a2 100644
--- a/usr.bin/tset/misc.c
+++ b/usr.bin/tset/misc.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <fcntl.h>
diff --git a/usr.bin/tset/set.c b/usr.bin/tset/set.c
index 68fa7a2259c..0f3081437d6 100644
--- a/usr.bin/tset/set.c
+++ b/usr.bin/tset/set.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)set.c	8.2 (Berkeley) 2/28/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <termios.h>
diff --git a/usr.bin/tset/term.c b/usr.bin/tset/term.c
index f64b8694417..857f9b1737b 100644
--- a/usr.bin/tset/term.c
+++ b/usr.bin/tset/term.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)term.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id: term.c,v 1.2 1997/08/18 07:27:56 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tset/tset.1 b/usr.bin/tset/tset.1
index fb07cf18b99..bb0481ad9be 100644
--- a/usr.bin/tset/tset.1
+++ b/usr.bin/tset/tset.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tset.1	8.1 (Berkeley) 6/9/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 9, 1993
 .Dt TSET 1
diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c
index a097dcac8ee..df6b5b452d1 100644
--- a/usr.bin/tset/tset.c
+++ b/usr.bin/tset/tset.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tset.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcdif[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tset/wrterm.c b/usr.bin/tset/wrterm.c
index d6274cfd1e0..8c5936898d6 100644
--- a/usr.bin/tset/wrterm.c
+++ b/usr.bin/tset/wrterm.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)wrterm.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tsort/tsort.1 b/usr.bin/tsort/tsort.1
index 8d9f25f1b29..6be1978fc06 100644
--- a/usr.bin/tsort/tsort.1
+++ b/usr.bin/tsort/tsort.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tsort.1	8.3 (Berkeley) 4/1/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 1, 1994
 .Dt TSORT 1
diff --git a/usr.bin/tsort/tsort.c b/usr.bin/tsort/tsort.c
index fca46e90485..2f73a80d1fe 100644
--- a/usr.bin/tsort/tsort.c
+++ b/usr.bin/tsort/tsort.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: tsort.c,v 1.8 1997/03/29 04:33:15 imp Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/tty/tty.1 b/usr.bin/tty/tty.1
index 67f2d634b35..dbf0e777661 100644
--- a/usr.bin/tty/tty.1
+++ b/usr.bin/tty/tty.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tty.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: tty.1,v 1.4 1997/02/22 19:57:29 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt TTY 1
diff --git a/usr.bin/tty/tty.c b/usr.bin/tty/tty.c
index 7a7e688d8a3..4d02fa9dccd 100644
--- a/usr.bin/tty/tty.c
+++ b/usr.bin/tty/tty.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tty.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.bin/ul/ul.1 b/usr.bin/ul/ul.1
index b84e826f891..470fea1450a 100644
--- a/usr.bin/ul/ul.1
+++ b/usr.bin/ul/ul.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ul.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt UL 1
diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c
index f6fbdf035b7..cfdd5524569 100644
--- a/usr.bin/ul/ul.c
+++ b/usr.bin/ul/ul.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ul.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: ul.c,v 1.4 1997/08/20 11:01:59 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/uname/uname.1 b/usr.bin/uname/uname.1
index b2d1168cf79..08f7508312e 100644
--- a/usr.bin/uname/uname.1
+++ b/usr.bin/uname/uname.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)uname.1	8.3 (Berkeley) 4/8/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd April 8, 1994
 .Dt UNAME 1
diff --git a/usr.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c
index 4d70913d7b2..ed05c85d73a 100644
--- a/usr.bin/unexpand/unexpand.c
+++ b/usr.bin/unexpand/unexpand.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)unexpand.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: unexpand.c,v 1.3 1997/08/26 11:02:36 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/unifdef/unifdef.1 b/usr.bin/unifdef/unifdef.1
index d0509692b49..2c06332d938 100644
--- a/usr.bin/unifdef/unifdef.1
+++ b/usr.bin/unifdef/unifdef.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)unifdef.1	8.2 (Berkeley) 4/1/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 1, 1994
 .Dt UNIFDEF 1
diff --git a/usr.bin/unifdef/unifdef.c b/usr.bin/unifdef/unifdef.c
index 58b92de9cea..0b7344b2eb7 100644
--- a/usr.bin/unifdef/unifdef.c
+++ b/usr.bin/unifdef/unifdef.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)unifdef.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: unifdef.c,v 1.2 1997/08/20 11:07:53 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/uniq/uniq.1 b/usr.bin/uniq/uniq.1
index 1728369f959..e14dd517cda 100644
--- a/usr.bin/uniq/uniq.1
+++ b/usr.bin/uniq/uniq.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)uniq.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: uniq.1,v 1.3 1997/09/07 15:09:22 joerg Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt UNIQ 1
diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c
index fe47d42c317..0cc7977bbaf 100644
--- a/usr.bin/uniq/uniq.c
+++ b/usr.bin/uniq/uniq.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)uniq.c	8.3 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-	"$Id: uniq.c,v 1.4 1997/09/07 15:09:22 joerg Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/units/Makefile b/usr.bin/units/Makefile
index 5f4f8057fd5..946132c7bb9 100644
--- a/usr.bin/units/Makefile
+++ b/usr.bin/units/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.3 1997/02/22 19:57:30 peter Exp $
+# $FreeBSD$
 
 PROG=	units
 
diff --git a/usr.bin/units/README b/usr.bin/units/README
index b7a173a3832..974cbe9fee3 100644
--- a/usr.bin/units/README
+++ b/usr.bin/units/README
@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 This is a program which I wrote as a clone of the UNIX 'units'
 command.  I threw it together in a couple days, but it seems to work,
diff --git a/usr.bin/units/pathnames.h b/usr.bin/units/pathnames.h
index f41f2077f16..227dd00b492 100644
--- a/usr.bin/units/pathnames.h
+++ b/usr.bin/units/pathnames.h
@@ -1,4 +1,4 @@
-/*	$Id$	*/
+/* $FreeBSD$	*/
 
 /*
  * Copyright (c) 1993 Christopher G. Demetriou
diff --git a/usr.bin/units/units.1 b/usr.bin/units/units.1
index 85f0159a51e..f1c2de8602e 100644
--- a/usr.bin/units/units.1
+++ b/usr.bin/units/units.1
@@ -1,4 +1,4 @@
-.\" $Id: units.1,v 1.6 1997/08/21 06:49:32 charnier Exp $
+.\" $FreeBSD$
 .Dd July 14, 1993
 .Dt UNITS 1
 .Os
diff --git a/usr.bin/units/units.c b/usr.bin/units/units.c
index 3eae64b5913..7d1fd785d5b 100644
--- a/usr.bin/units/units.c
+++ b/usr.bin/units/units.c
@@ -17,7 +17,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/units/units.lib b/usr.bin/units/units.lib
index f02649a78c7..a2f82145988 100644
--- a/usr.bin/units/units.lib
+++ b/usr.bin/units/units.lib
@@ -1,4 +1,4 @@
-/ $Id: units.lib,v 1.3 1997/02/22 19:57:34 peter Exp $
+/ $FreeBSD$
 
 / primitive units
 
diff --git a/usr.bin/unvis/unvis.1 b/usr.bin/unvis/unvis.1
index f16c3ff60c7..a3cb608a0d9 100644
--- a/usr.bin/unvis/unvis.1
+++ b/usr.bin/unvis/unvis.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)unvis.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt UNVIS 1
diff --git a/usr.bin/unvis/unvis.c b/usr.bin/unvis/unvis.c
index 1549fd9ac24..418b74ec460 100644
--- a/usr.bin/unvis/unvis.c
+++ b/usr.bin/unvis/unvis.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)unvis.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: unvis.c,v 1.3 1997/08/21 06:52:43 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/users/users.1 b/usr.bin/users/users.1
index 1542aa95a2c..87496070530 100644
--- a/usr.bin/users/users.1
+++ b/usr.bin/users/users.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)users.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt USERS 1
diff --git a/usr.bin/users/users.c b/usr.bin/users/users.c
index a3ab2b5ba8c..7acb26836e4 100644
--- a/usr.bin/users/users.c
+++ b/usr.bin/users/users.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)users.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: users.c,v 1.3 1997/08/22 06:50:33 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/uudecode/uudecode.c b/usr.bin/uudecode/uudecode.c
index bb01770f05b..247e80212d1 100644
--- a/usr.bin/uudecode/uudecode.c
+++ b/usr.bin/uudecode/uudecode.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)uudecode.c	8.2 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: uudecode.c,v 1.11 1998/01/25 19:25:54 wosch Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/uuencode/uuencode.1 b/usr.bin/uuencode/uuencode.1
index 784b39407f6..9616d660897 100644
--- a/usr.bin/uuencode/uuencode.1
+++ b/usr.bin/uuencode/uuencode.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)uuencode.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: uuencode.1,v 1.6 1997/08/22 06:52:59 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt UUENCODE 1
diff --git a/usr.bin/uuencode/uuencode.c b/usr.bin/uuencode/uuencode.c
index b10a524a190..e8696e900d0 100644
--- a/usr.bin/uuencode/uuencode.c
+++ b/usr.bin/uuencode/uuencode.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)uuencode.c	8.2 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/uuencode/uuencode.format.5 b/usr.bin/uuencode/uuencode.format.5
index 4ffc7f217a3..10f16995c8c 100644
--- a/usr.bin/uuencode/uuencode.format.5
+++ b/usr.bin/uuencode/uuencode.format.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)uuencode.format.5	8.2 (Berkeley) 1/12/94
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd January 12, 1994
 .Dt UUENCODE 5
diff --git a/usr.bin/vacation/Makefile b/usr.bin/vacation/Makefile
index 6fc47954892..ee668d894e6 100644
--- a/usr.bin/vacation/Makefile
+++ b/usr.bin/vacation/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	vacation
 CFLAGS+= -Wall
diff --git a/usr.bin/vacation/vacation.1 b/usr.bin/vacation/vacation.1
index e90eef6c741..7d2c6aee655 100644
--- a/usr.bin/vacation/vacation.1
+++ b/usr.bin/vacation/vacation.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)vacation.1	8.1 (Berkeley) 6/16/93
-.\"	$Id: vacation.1,v 1.7 1999/06/17 14:44:41 sheldonh Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 16, 1993
 .Dt VACATION 1
diff --git a/usr.bin/vacation/vacation.c b/usr.bin/vacation/vacation.c
index b94afe77ac8..98a2987abd3 100644
--- a/usr.bin/vacation/vacation.c
+++ b/usr.bin/vacation/vacation.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)from: vacation.c	8.2 (Berkeley) 1/26/94";
 #endif
 static const char rcsid[] =
-	"$Id: vacation.c,v 1.16 1999/06/17 14:49:19 sheldonh Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/vgrind/vfontedpr.c b/usr.bin/vgrind/vfontedpr.c
index 8b5102aef36..09c63380307 100644
--- a/usr.bin/vgrind/vfontedpr.c
+++ b/usr.bin/vgrind/vfontedpr.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)vfontedpr.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: vfontedpr.c,v 1.10 1997/09/18 14:07:33 phk Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vgrind/vgrind.1 b/usr.bin/vgrind/vgrind.1
index 513658f4df3..7e03ac7b091 100644
--- a/usr.bin/vgrind/vgrind.1
+++ b/usr.bin/vgrind/vgrind.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vgrind.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt VGRIND 1
diff --git a/usr.bin/vgrind/vgrindefs.5 b/usr.bin/vgrind/vgrindefs.5
index 5449f77d291..105442b80b4 100644
--- a/usr.bin/vgrind/vgrindefs.5
+++ b/usr.bin/vgrind/vgrindefs.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vgrindefs.5	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt VGRINDEFS 5
diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile
index 94b352ac8a2..d2c463e06d2 100644
--- a/usr.bin/vi/Makefile
+++ b/usr.bin/vi/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.23 1998/09/05 12:25:54 asami Exp $
+# $FreeBSD$
 #
 # This has most of the glue needed to compile tknvi and the perl hooks,
 # but not all.
diff --git a/usr.bin/vis/foldit.c b/usr.bin/vis/foldit.c
index 2bbf15d92f5..6cf63f35ac0 100644
--- a/usr.bin/vis/foldit.c
+++ b/usr.bin/vis/foldit.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)foldit.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.bin/vis/vis.1 b/usr.bin/vis/vis.1
index b2840580d3f..47c080dffa2 100644
--- a/usr.bin/vis/vis.1
+++ b/usr.bin/vis/vis.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)vis.1	8.4 (Berkeley) 4/19/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt VIS 1
diff --git a/usr.bin/vis/vis.c b/usr.bin/vis/vis.c
index edead0124b0..0ff6a21f0a0 100644
--- a/usr.bin/vis/vis.c
+++ b/usr.bin/vis/vis.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)vis.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/vmstat/vmstat.8 b/usr.bin/vmstat/vmstat.8
index 7fb1ddb8601..860628e8869 100644
--- a/usr.bin/vmstat/vmstat.8
+++ b/usr.bin/vmstat/vmstat.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)vmstat.8	8.1 (Berkeley) 6/6/93
-.\"	$Id: vmstat.8,v 1.14 1999/04/26 14:08:04 kris Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1996
 .Dt VMSTAT 8
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index c67a1eb637c..a06b44e0b9f 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)vmstat.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: vmstat.c,v 1.35 1999/05/12 11:49:47 bde Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/w/pr_time.c b/usr.bin/w/pr_time.c
index 5b38b58dd12..2a7eb1d1bf9 100644
--- a/usr.bin/w/pr_time.c
+++ b/usr.bin/w/pr_time.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)pr_time.c	8.2 (Berkeley) 4/4/94";
 #endif
 static const char rcsid[] =
-	"$Id: pr_time.c,v 1.11 1997/12/28 17:50:10 alex Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/w/uptime.1 b/usr.bin/w/uptime.1
index 87370c59782..20ebaa0ffbd 100644
--- a/usr.bin/w/uptime.1
+++ b/usr.bin/w/uptime.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)uptime.1	8.2 (Berkeley) 4/18/94
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt UPTIME 1
diff --git a/usr.bin/w/w.1 b/usr.bin/w/w.1
index 87d08ddd730..12f3da808c1 100644
--- a/usr.bin/w/w.1
+++ b/usr.bin/w/w.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)w.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: w.1,v 1.10 1998/03/22 17:39:08 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt W 1
diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c
index ff3eb57583f..6441ee8f896 100644
--- a/usr.bin/w/w.c
+++ b/usr.bin/w/w.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)w.c	8.4 (Berkeley) 4/16/94";
 #endif
 static const char rcsid[] =
-	"$Id: w.c,v 1.35 1999/07/04 17:26:12 billf Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/wall/ttymsg.c b/usr.bin/wall/ttymsg.c
index 65890cac45b..2b58a1b97eb 100644
--- a/usr.bin/wall/ttymsg.c
+++ b/usr.bin/wall/ttymsg.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)ttymsg.c	8.2 (Berkeley) 11/16/93";
 #endif
 static const char rcsid[] =
-	"$Id: ttymsg.c,v 1.2 1998/03/23 07:47:31 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/wall/wall.1 b/usr.bin/wall/wall.1
index b948a7e639a..73f92803664 100644
--- a/usr.bin/wall/wall.1
+++ b/usr.bin/wall/wall.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)wall.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt WALL 1
diff --git a/usr.bin/wall/wall.c b/usr.bin/wall/wall.c
index 288bea32c2c..448f7a94355 100644
--- a/usr.bin/wall/wall.c
+++ b/usr.bin/wall/wall.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)wall.c	8.2 (Berkeley) 11/16/93";
 #endif
 static const char rcsid[] =
-	"$Id: wall.c,v 1.9 1997/09/15 01:03:16 ache Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1
index fec2b5f5762..86fc751fe7a 100644
--- a/usr.bin/wc/wc.1
+++ b/usr.bin/wc/wc.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)wc.1	8.2 (Berkeley) 4/19/94
-.\"	$Id: wc.1,v 1.4 1997/02/22 19:57:44 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt WC 1
diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c
index c04a6b05c5b..3793a905af2 100644
--- a/usr.bin/wc/wc.c
+++ b/usr.bin/wc/wc.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)wc.c	8.1 (Berkeley) 6/6/93";
 #else
 static const char rcsid[] =
-	"$Id: wc.c,v 1.9 1999/08/06 14:37:13 sheldonh Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/what/what.1 b/usr.bin/what/what.1
index 7e369a9a0c1..b5fe8bb05c8 100644
--- a/usr.bin/what/what.1
+++ b/usr.bin/what/what.1
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)what.1	8.1 (Berkeley) 6/6/93
 .\"
-.\" $Id: what.1,v 1.8 1998/04/14 06:31:23 phk Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt WHAT 1
diff --git a/usr.bin/what/what.c b/usr.bin/what/what.c
index ebc4d1107e9..5a9bf35018e 100644
--- a/usr.bin/what/what.c
+++ b/usr.bin/what/what.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)what.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: what.c,v 1.3 1997/08/25 06:49:45 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/whereis/whereis.1 b/usr.bin/whereis/whereis.1
index b569301bdf4..8e6404b4c92 100644
--- a/usr.bin/whereis/whereis.1
+++ b/usr.bin/whereis/whereis.1
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)whereis.1	8.2 (Berkeley) 12/30/93
 .\"
-.\" $Id: whereis.1,v 1.6 1998/08/31 16:41:08 wosch Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 15, 1996
 .Dt WHEREIS 1
diff --git a/usr.bin/whereis/whereis.pl b/usr.bin/whereis/whereis.pl
index f53d2a6fb2b..1af1d4769f9 100644
--- a/usr.bin/whereis/whereis.pl
+++ b/usr.bin/whereis/whereis.pl
@@ -28,7 +28,7 @@
 #
 # Rewritten from scratch for FreeBSD after the 4.3BSD manual page.
 #
-# $Id: whereis.pl,v 1.6 1998/10/04 10:33:37 obrien Exp $
+# $FreeBSD$
 #
 
 sub usage
diff --git a/usr.bin/which/Makefile b/usr.bin/which/Makefile
index d049eee3579..94646408bc8 100644
--- a/usr.bin/which/Makefile
+++ b/usr.bin/which/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+# $FreeBSD$
 
 MAINTAINER= wosch
 
diff --git a/usr.bin/which/which.1 b/usr.bin/which/which.1
index ec1d8c45a46..e9ae9d32ae7 100644
--- a/usr.bin/which/which.1
+++ b/usr.bin/which/which.1
@@ -27,7 +27,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 .\" OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id: which.1,v 1.11 1998/05/15 11:22:42 jkoshy Exp $
+.\" $FreeBSD$
 .Dd January 26, 1995
 .Dt WHICH 1
 .Os FreeBSD
diff --git a/usr.bin/which/which.pl b/usr.bin/which/which.pl
index 55214a60755..781e1c15160 100755
--- a/usr.bin/which/which.pl
+++ b/usr.bin/which/which.pl
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $Id: which.pl,v 1.12 1998/01/02 13:46:25 helbig Exp $
+# $FreeBSD$
 
 $all = $silent = $found = 0;
 @path = split(/:/, $ENV{'PATH'});
diff --git a/usr.bin/who/who.1 b/usr.bin/who/who.1
index 1964a1a78bb..6352eab33d8 100644
--- a/usr.bin/who/who.1
+++ b/usr.bin/who/who.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)who.1	8.2 (Berkeley) 12/30/93
-.\"	$Id: who.1,v 1.5 1997/08/26 11:14:56 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt WHO 1
diff --git a/usr.bin/who/who.c b/usr.bin/who/who.c
index 26500ca6887..76ecdc2ae94 100644
--- a/usr.bin/who/who.c
+++ b/usr.bin/who/who.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)who.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: who.c,v 1.6 1998/04/26 19:10:51 des Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1
index 11138392cbf..bdb2e3b637a 100644
--- a/usr.bin/whois/whois.1
+++ b/usr.bin/whois/whois.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)whois.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: whois.1,v 1.5 1999/02/01 19:22:27 wollman Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 1, 1999
 .Dt WHOIS 1
diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c
index 321136c6ef1..d1a0855930e 100644
--- a/usr.bin/whois/whois.c
+++ b/usr.bin/whois/whois.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)whois.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: whois.c,v 1.7 1999/02/01 19:22:27 wollman Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/window/window.1 b/usr.bin/window/window.1
index 6391a8e30e0..5070cfb8bb3 100644
--- a/usr.bin/window/window.1
+++ b/usr.bin/window/window.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)window.1	8.2 (Berkeley) 12/30/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt WINDOW 1
diff --git a/usr.bin/write/write.1 b/usr.bin/write/write.1
index a5fe52d3403..2b949020941 100644
--- a/usr.bin/write/write.1
+++ b/usr.bin/write/write.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)write.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: write.1,v 1.5 1997/03/22 17:19:32 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt WRITE 1
diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c
index f1a37fb6003..406eeb3f756 100644
--- a/usr.bin/write/write.c
+++ b/usr.bin/write/write.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)write.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: write.c,v 1.10 1997/09/15 00:40:34 ache Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/xargs/xargs.1 b/usr.bin/xargs/xargs.1
index b16fb8929fd..8dec056ca98 100644
--- a/usr.bin/xargs/xargs.1
+++ b/usr.bin/xargs/xargs.1
@@ -34,7 +34,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)xargs.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt XARGS 1
diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c
index 41bf75a1486..2ad94cc9092 100644
--- a/usr.bin/xargs/xargs.c
+++ b/usr.bin/xargs/xargs.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)xargs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: xargs.c,v 1.7 1998/10/13 14:52:32 des Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1
index 46f1b3b0014..46179cbf73f 100644
--- a/usr.bin/xinstall/install.1
+++ b/usr.bin/xinstall/install.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)install.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: install.1,v 1.12 1998/06/02 12:00:08 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 22, 1996
 .Dt INSTALL 1
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index 0948040f561..769d095624c 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "From: @(#)xinstall.c	8.1 (Berkeley) 7/21/93";
 #endif
 static const char rcsid[] =
-	"$Id: xinstall.c,v 1.33 1998/10/13 14:52:33 des Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/xlint/lint1/Makefile b/usr.bin/xlint/lint1/Makefile
index 6ba805cb26a..fef8dae7380 100644
--- a/usr.bin/xlint/lint1/Makefile
+++ b/usr.bin/xlint/lint1/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.3 1995/07/04 01:53:05 cgd Exp $
-#	$Id$
+# $FreeBSD$
 
 PROG=	lint1
 SRCS=	cgram.y scan.l mem1.c mem.c err.c main1.c decl.c tree.c func.c \
diff --git a/usr.bin/xlint/xlint/lint.1 b/usr.bin/xlint/xlint/lint.1
index 7b15b2c0ae1..d076b3676cc 100644
--- a/usr.bin/xlint/xlint/lint.1
+++ b/usr.bin/xlint/xlint/lint.1
@@ -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$
 .\"
 .Dd August 28, 1994
 .Dt LINT 1
diff --git a/usr.bin/xstr/xstr.1 b/usr.bin/xstr/xstr.1
index 497965ad6cb..777da20493b 100644
--- a/usr.bin/xstr/xstr.1
+++ b/usr.bin/xstr/xstr.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)xstr.1	8.2 (Berkeley) 12/30/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd December 30, 1993
 .Dt XSTR 1
diff --git a/usr.bin/xstr/xstr.c b/usr.bin/xstr/xstr.c
index 5820f706691..8160bb85763 100644
--- a/usr.bin/xstr/xstr.c
+++ b/usr.bin/xstr/xstr.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)xstr.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/yacc/Makefile b/usr.bin/yacc/Makefile
index 4e4fec28da1..3a871d989b4 100644
--- a/usr.bin/yacc/Makefile
+++ b/usr.bin/yacc/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.3 (Berkeley) 5/12/90
-#	$Id$
+# $FreeBSD$
 
 PROG=	yacc
 SRCS=	closure.c error.c lalr.c lr0.c main.c mkpar.c output.c reader.c \
diff --git a/usr.bin/yacc/closure.c b/usr.bin/yacc/closure.c
index 82751060fbd..4caf4585764 100644
--- a/usr.bin/yacc/closure.c
+++ b/usr.bin/yacc/closure.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/defs.h b/usr.bin/yacc/defs.h
index 612d4ee4e04..a8d8113d316 100644
--- a/usr.bin/yacc/defs.h
+++ b/usr.bin/yacc/defs.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)defs.h	5.6 (Berkeley) 5/24/93
- *	$Id: defs.h,v 1.6 1997/08/28 06:33:52 charnier Exp $
+ * $FreeBSD$
  */
 
 #include <sys/cdefs.h>	/* for __P macro */
diff --git a/usr.bin/yacc/error.c b/usr.bin/yacc/error.c
index 0e789ec69c2..3229f345104 100644
--- a/usr.bin/yacc/error.c
+++ b/usr.bin/yacc/error.c
@@ -39,7 +39,7 @@
 static char const sccsid[] = "@(#)error.c	5.3 (Berkeley) 6/1/90";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /* routines for printing error messages  */
diff --git a/usr.bin/yacc/lalr.c b/usr.bin/yacc/lalr.c
index 275f7d1605f..bd61e489e46 100644
--- a/usr.bin/yacc/lalr.c
+++ b/usr.bin/yacc/lalr.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/lr0.c b/usr.bin/yacc/lr0.c
index 96d87a9714c..07816d2ac11 100644
--- a/usr.bin/yacc/lr0.c
+++ b/usr.bin/yacc/lr0.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/main.c b/usr.bin/yacc/main.c
index 1501a592ff8..0a5511fdf56 100644
--- a/usr.bin/yacc/main.c
+++ b/usr.bin/yacc/main.c
@@ -45,7 +45,7 @@ static char const copyright[] =
 static char const sccsid[] = "@(#)main.c	5.5 (Berkeley) 5/24/93";
 #endif
 static const char rcsid[] =
-	"$Id: main.c,v 1.8 1997/08/28 06:33:53 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <signal.h>
diff --git a/usr.bin/yacc/mkpar.c b/usr.bin/yacc/mkpar.c
index ad44c4c2b78..e7ca1e36b91 100644
--- a/usr.bin/yacc/mkpar.c
+++ b/usr.bin/yacc/mkpar.c
@@ -39,7 +39,7 @@
 static char const sccsid[] = "@(#)mkpar.c	5.3 (Berkeley) 1/20/91";
 #endif
 static const char rcsid[] =
-	"$Id: mkpar.c,v 1.8 1999/07/04 17:26:16 billf Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/usr.bin/yacc/output.c b/usr.bin/yacc/output.c
index 3d32c065d59..255aeea809b 100644
--- a/usr.bin/yacc/output.c
+++ b/usr.bin/yacc/output.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: output.c,v 1.9 1997/04/29 03:05:38 steve Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/reader.c b/usr.bin/yacc/reader.c
index e0eed8d6531..4e2e588241a 100644
--- a/usr.bin/yacc/reader.c
+++ b/usr.bin/yacc/reader.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: reader.c,v 1.6 1997/02/22 19:58:01 peter Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/skeleton.c b/usr.bin/yacc/skeleton.c
index 28df10bab63..f3d6dd0d363 100644
--- a/usr.bin/yacc/skeleton.c
+++ b/usr.bin/yacc/skeleton.c
@@ -56,7 +56,7 @@ char *banner[] =
 {
     "#ifndef lint",
     "static char const ",
-    "yyrcsid[] = \"$Id: skeleton.c,v 1.19 1999/07/30 06:40:00 obrien Exp $\";",
+    "yyrcsid[] = \"$FreeBSD$\";",
     "#endif",
     "#include <stdlib.h>",
     "#define YYBYACC 1",
diff --git a/usr.bin/yacc/symtab.c b/usr.bin/yacc/symtab.c
index 2f2ee2e136d..f155021bb68 100644
--- a/usr.bin/yacc/symtab.c
+++ b/usr.bin/yacc/symtab.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/verbose.c b/usr.bin/yacc/verbose.c
index c2cfee5d8b8..69ce15e1d27 100644
--- a/usr.bin/yacc/verbose.c
+++ b/usr.bin/yacc/verbose.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/warshall.c b/usr.bin/yacc/warshall.c
index 680363c1264..37408c0b3fa 100644
--- a/usr.bin/yacc/warshall.c
+++ b/usr.bin/yacc/warshall.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/yacc.1 b/usr.bin/yacc/yacc.1
index f532779264f..23a3b0d5b4a 100644
--- a/usr.bin/yacc/yacc.1
+++ b/usr.bin/yacc/yacc.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)yacc.1	5.8 (Berkeley) 5/24/93
-.\"     $Id: yacc.1,v 1.7 1997/05/14 02:33:08 steve Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 24, 1993
 .Dt YACC 1
diff --git a/usr.bin/yacc/yyfix.1 b/usr.bin/yacc/yyfix.1
index 7aad08e056b..3b50a624e2d 100644
--- a/usr.bin/yacc/yyfix.1
+++ b/usr.bin/yacc/yyfix.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)yyfix.1	5.4 (Berkeley) 3/23/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .Dd March 23, 1993
 .Dt YYFIX 1
diff --git a/usr.bin/yes/yes.1 b/usr.bin/yes/yes.1
index 76ae9dbf018..e19020f70ae 100644
--- a/usr.bin/yes/yes.1
+++ b/usr.bin/yes/yes.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)yes.1	8.1 (Berkeley) 6/6/93
-.\"     $Id$
+.\" $FreeBSD$
 .\"
 .Dd June 6, 1993
 .Dt YES 1
diff --git a/usr.bin/ypcat/Makefile b/usr.bin/ypcat/Makefile
index d04375c9dd7..58ee6907f07 100644
--- a/usr.bin/ypcat/Makefile
+++ b/usr.bin/ypcat/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-#	$Id$
+# $FreeBSD$
 
 PROG=	ypcat
 
diff --git a/usr.bin/ypcat/ypcat.1 b/usr.bin/ypcat/ypcat.1
index 605a0c3cd08..139b2c6e579 100644
--- a/usr.bin/ypcat/ypcat.1
+++ b/usr.bin/ypcat/ypcat.1
@@ -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: ypcat.1,v 1.6 1997/08/29 11:48:48 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 3, 1993
 .Dt YPCAT 1
diff --git a/usr.bin/ypcat/ypcat.c b/usr.bin/ypcat/ypcat.c
index 2604115a388..e90e763a034 100644
--- a/usr.bin/ypcat/ypcat.c
+++ b/usr.bin/ypcat/ypcat.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ypmatch/Makefile b/usr.bin/ypmatch/Makefile
index bdf13edac4c..22e62996937 100644
--- a/usr.bin/ypmatch/Makefile
+++ b/usr.bin/ypmatch/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-#	$Id$
+# $FreeBSD$
 
 PROG=	ypmatch
 
diff --git a/usr.bin/ypmatch/ypmatch.1 b/usr.bin/ypmatch/ypmatch.1
index d3cc5bf5396..6491407e942 100644
--- a/usr.bin/ypmatch/ypmatch.1
+++ b/usr.bin/ypmatch/ypmatch.1
@@ -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: ypmatch.1,v 1.6 1997/08/29 11:52:52 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd December 3, 1993
 .Dt YPMATCH 1
diff --git a/usr.bin/ypmatch/ypmatch.c b/usr.bin/ypmatch/ypmatch.c
index 25e4530146f..be266bb7e1e 100644
--- a/usr.bin/ypmatch/ypmatch.c
+++ b/usr.bin/ypmatch/ypmatch.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: ypmatch.c,v 1.5 1997/08/29 11:52:52 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ypwhich/Makefile b/usr.bin/ypwhich/Makefile
index 38d9edda0be..f28f864ab09 100644
--- a/usr.bin/ypwhich/Makefile
+++ b/usr.bin/ypwhich/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-#	$Id: Makefile,v 1.3 1997/02/22 19:58:13 peter Exp $
+# $FreeBSD$
 
 PROG=	ypwhich
 
diff --git a/usr.bin/ypwhich/ypwhich.1 b/usr.bin/ypwhich/ypwhich.1
index d3adc258ce4..88ca36d759b 100644
--- a/usr.bin/ypwhich/ypwhich.1
+++ b/usr.bin/ypwhich/ypwhich.1
@@ -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: ypwhich.1,v 1.2 1998/03/23 07:48:45 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd February 23, 1994
 .Dt YPWHICH 1
diff --git a/usr.bin/ypwhich/ypwhich.c b/usr.bin/ypwhich/ypwhich.c
index 763875f5e6b..2bc9ff377dd 100644
--- a/usr.bin/ypwhich/ypwhich.c
+++ b/usr.bin/ypwhich/ypwhich.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: ypwhich.c,v 1.9 1997/08/29 11:56:51 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>